Skip to content

Commit

Permalink
fix: fnd-dt, re-run stencil (#42)
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredallard authored Aug 3, 2022
1 parent 95e4bc3 commit 512bfaf
Show file tree
Hide file tree
Showing 9 changed files with 198 additions and 121 deletions.
48 changes: 32 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# Please re-run stencil after any changes to this file.
# Please re-run stencil after any changes to this file as invalid
# syntax, such as anchors, will be fixed automatically.
version: 2.1
orbs:
shared: getoutreach/shared@1.60.0
shared: getoutreach/shared@2.2.0

# Extra contexts to expose to all jobs below
contexts: &contexts
### Start contexts inserted by other modules
### End contexts inserted by other modules
- aws-credentials
- npm-credentials
- prismacloud-credentials
- opslevel-credentials
- vault-dev
- confluence
###Block(extraContexts)
- docker-registry
- ghaccesstoken
Expand All @@ -29,24 +34,14 @@ workflows:

### Start workflows inserted by other modules
### End workflows inserted by other modules
release_branch:
triggers:
- schedule:
cron: 0 0 15 * *
filters:
branches:
only:
- release
jobs:
- shared/merge:
head: release
base: main

release:
jobs:
###Block(circleWorkflowJobs)

###EndBlock(circleWorkflowJobs)
### Start jobs inserted by other modules
### End jobs inserted by other modules
- shared/release: &release
dryrun: false
context: *contexts
Expand Down Expand Up @@ -77,6 +72,11 @@ workflows:
- shared/test:
context: *contexts
app_name: stencil-base
### Start parameters inserted by other modules
### End parameters inserted by other modules
###Block(circleTestExtra)

###EndBlock(circleTestExtra)

- shared/publish_docs:
context: *contexts
Expand All @@ -88,4 +88,20 @@ workflows:
- shared/finalize-coverage:
context: *contexts
requires:
- shared/e2e
- shared/test
- shared/e2e:
context: *contexts
###Block(circleE2EExtra)

###EndBlock(circleE2EExtra)
- shared/docker:
context: *contexts
filters:
branches:
ignore:
- master
- main
- release
tags:
only: /v\d+(\.\d+)*(-.*)*/
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See https://help.github.com/articles/about-codeowners/
* @getoutreach/fnd-dtss
* @getoutreach/fnd-dt

###Block(customCodeowners)

Expand Down
4 changes: 4 additions & 0 deletions .releaserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ plugins:
# This creates fancy release notes in our Github release
- "@semantic-release/release-notes-generator"
- "@semantic-release/github"

### Block(customReleasePlugins)

### EndBlock(customReleasePlugins)
10 changes: 8 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
golang 1.18
nodejs 16.14.2
# This file contains tool versions for use with asdf
golang 1.18.1
nodejs 16.14.2
# Note: Versions in this block override the above. Be EXTREMELY
# CAREFUL with this. If you override a standard version you are
# reducing compatibility guarantees.
###Block(toolver)
###EndBlock(toolver)
18 changes: 17 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,25 @@

<!--- EndBlock(customBuildingAndTesting) -->

### Replacing a Remote Version of the a Package with Local Version

_This is only applicable if this repository exposes a public package_.

If you want to test a package exposed in this repository in a project that uses it, you can
add the following `replace` directive to that project's `go.mod` file:

```
replace github.com/getoutreach/stencil-base => /path/to/local/version/stencil-base
```

**_Note_**: This repository may have postfixed it's module path with a version, go check the first
line of the `go.mod` file in this repository to see if that is the case. If that is the case,
you will need to modify the first part of the replace directive (the part before the `=>`) with
that postfixed path.

### Linting and Unit Testing

You can run the the linters and unit tests with:
You can run the linters and unit tests with:

```bash
make test
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
[![Generated via Bootstrap](https://img.shields.io/badge/Outreach-Bootstrap-%235951ff)](https://github.com/getoutreach/bootstrap)
[![Coverage Status](https://coveralls.io/repos/github/getoutreach/stencil-base/badge.svg?branch=main)](https://coveralls.io/github//getoutreach/stencil-base?branch=main)

Base templates for a stencil backed service

## Contributing

Please read the [CONTRIBUTING.md](CONTRIBUTING.md) document for guidelines on developing and contributing changes.
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
versions:
# HACK(jaredallard): Remove when stencil-base is cleaned up and bootstrap
# is dead.
devbase: v1.58.1
devbase: v2.1.0-rc.11
4 changes: 2 additions & 2 deletions service.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: stencil-base
arguments:
reportingTeam: fnd-dtss
description: Base templates for a stencil backed service
reportingTeam: fnd-dt
releaseOptions:
enablePrereleases: true
modules:
- name: github.com/getoutreach/stencil-template-base
- name: github.com/getoutreach/stencil-circleci
version: v0.1.4-rc.1
replacements:
github.com/getoutreach/stencil-base: ./
229 changes: 131 additions & 98 deletions stencil.lock
Original file line number Diff line number Diff line change
@@ -1,100 +1,133 @@
version: v1.11.1
generated: 2022-04-29T02:45:32.172392Z
version: v1.22.0
generated: 2022-08-03T21:50:22.923403Z
modules:
- name: github.com/getoutreach/stencil-base
url: ./
version: v0.2.0
- name: github.com/getoutreach/stencil-circleci
url: https://github.com/getoutreach/stencil-circleci
version: v0.1.4-rc.1
- name: github.com/getoutreach/stencil-template-base
url: https://github.com/getoutreach/stencil-template-base
version: v0.2.0
- name: github.com/getoutreach/stencil-base
url: file://./
version: local
- name: github.com/getoutreach/stencil-circleci
url: https://github.com/getoutreach/stencil-circleci
version: v1.2.1
- name: github.com/getoutreach/stencil-template-base
url: https://github.com/getoutreach/stencil-template-base
version: v0.3.2
files:
- name: .editorconfig
template: .editorconfig.tpl
module: github.com/getoutreach/stencil-base
- name: .github/CODEOWNERS
template: .github/CODEOWNERS.tpl
module: github.com/getoutreach/stencil-base
- name: .github/pull_request_template.md
template: .github/pull_request_template.md.tpl
module: github.com/getoutreach/stencil-base
- name: .gitignore
template: .gitignore.tpl
module: github.com/getoutreach/stencil-base
- name: .releaserc.yaml
template: .releaserc.yaml.tpl
module: github.com/getoutreach/stencil-base
- name: .tool-versions
template: .tool-versions.tpl
module: github.com/getoutreach/stencil-base
- name: CONTRIBUTING.md
template: CONTRIBUTING.md.tpl
module: github.com/getoutreach/stencil-base
- name: LICENSE
template: LICENSE.tpl
module: github.com/getoutreach/stencil-base
- name: README.md
template: README.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/README.md
template: documentation/README.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/SLOs.md
template: documentation/SLOs.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/disaster-recovery.md
template: documentation/disaster-recovery.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/rollout-plan.md
template: documentation/rollout-plan.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbook.md
template: documentation/runbook.md.tpl
module: github.com/getoutreach/stencil-base
- name: helpers
template: helpers.tpl
module: github.com/getoutreach/stencil-base
- name: package.json
template: package.json.tpl
module: github.com/getoutreach/stencil-base
- name: scripts/bootstrap-lib.sh
template: scripts/bootstrap-lib.sh.tpl
module: github.com/getoutreach/stencil-base
- name: scripts/devbase.sh
template: scripts/devbase.sh.tpl
module: github.com/getoutreach/stencil-base
- name: scripts/shell-wrapper.sh
template: scripts/shell-wrapper.sh.tpl
module: github.com/getoutreach/stencil-base
- name: .circleci/config.yml
template: .circleci/config.yml.tpl
module: github.com/getoutreach/stencil-circleci
- name: _helpers
template: _helpers.tpl
module: github.com/getoutreach/stencil-circleci
- name: .tool-versions
template: .tool-versions.tpl
module: github.com/getoutreach/stencil-template-base
- name: LICENSE.txt
template: LICENSE.txt.tpl
module: github.com/getoutreach/stencil-template-base
- name: Makefile
template: Makefile.tpl
module: github.com/getoutreach/stencil-template-base
- name: bootstrap.lock
template: bootstrap.lock.tpl
module: github.com/getoutreach/stencil-template-base
- name: go.mod
template: go.mod.tpl
module: github.com/getoutreach/stencil-template-base
- name: manifest.yaml
template: manifest.yaml.tpl
module: github.com/getoutreach/stencil-template-base
- name: scripts/golangci.yml
template: scripts/golangci.yml.tpl
module: github.com/getoutreach/stencil-template-base
- name: templates/main_test.go
template: templates/main_test.go.tpl
module: github.com/getoutreach/stencil-template-base
- name: .circleci/config.yml
template: .circleci/config.yml.tpl
module: github.com/getoutreach/stencil-circleci
- name: .editorconfig
template: .editorconfig.tpl
module: github.com/getoutreach/stencil-base
- name: .github/CODEOWNERS
template: .github/CODEOWNERS.tpl
module: github.com/getoutreach/stencil-base
- name: .github/pull_request_template.md
template: .github/pull_request_template.md.tpl
module: github.com/getoutreach/stencil-base
- name: .gitignore
template: .gitignore.tpl
module: github.com/getoutreach/stencil-base
- name: .goreleaser.yml
template: .goreleaser.yml.tpl
module: github.com/getoutreach/stencil-template-base
- name: .releaserc.yaml
template: .releaserc.yaml.tpl
module: github.com/getoutreach/stencil-base
- name: .tool-versions
template: .tool-versions.tpl
module: github.com/getoutreach/stencil-base
- name: CONTRIBUTING.md
template: CONTRIBUTING.md.tpl
module: github.com/getoutreach/stencil-base
- name: LICENSE
template: LICENSE.tpl
module: github.com/getoutreach/stencil-base
- name: LICENSE.txt
template: LICENSE.txt.tpl
module: github.com/getoutreach/stencil-template-base
- name: Makefile
template: Makefile.tpl
module: github.com/getoutreach/stencil-template-base
- name: README.md
template: README.md.tpl
module: github.com/getoutreach/stencil-base
- name: _helpers
template: _helpers.tpl
module: github.com/getoutreach/stencil-template-base
- name: _helpers
template: _helpers.tpl
module: github.com/getoutreach/stencil-base
- name: _helpers
template: _helpers.tpl
module: github.com/getoutreach/stencil-circleci
- name: bootstrap.lock
template: bootstrap.lock.tpl
module: github.com/getoutreach/stencil-template-base
- name: documentation/README.md
template: documentation/README.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/SLOs.md
template: documentation/SLOs.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/deployments.md
template: documentation/deployments.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/disaster-recovery.md
template: documentation/disaster-recovery.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/rollout-plan.md
template: documentation/rollout-plan.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbook.md
template: documentation/runbook.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/available-pods-low.md
template: documentation/runbooks/available-pods-low.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/grpc-latency-high.md
template: documentation/runbooks/grpc-latency-high.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/grpc-success-rate-low.md
template: documentation/runbooks/grpc-success-rate-low.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/http-latency-high.md
template: documentation/runbooks/http-latency-high.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/http-success-rate-low.md
template: documentation/runbooks/http-success-rate-low.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/pod-cpu.md
template: documentation/runbooks/pod-cpu.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/pod-memory.md
template: documentation/runbooks/pod-memory.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/pod-restarts.md
template: documentation/runbooks/pod-restarts.md.tpl
module: github.com/getoutreach/stencil-base
- name: documentation/runbooks/service-panics.md
template: documentation/runbooks/service-panics.md.tpl
module: github.com/getoutreach/stencil-base
- name: go.mod
template: go.mod.tpl
module: github.com/getoutreach/stencil-template-base
- name: manifest.yaml
template: manifest.yaml.tpl
module: github.com/getoutreach/stencil-template-base
- name: package.json
template: package.json.tpl
module: github.com/getoutreach/stencil-base
- name: scripts/bootstrap-lib.sh
template: scripts/bootstrap-lib.sh.tpl
module: github.com/getoutreach/stencil-base
- name: scripts/devbase.sh
template: scripts/devbase.sh.tpl
module: github.com/getoutreach/stencil-base
- name: scripts/golangci.yml
template: scripts/golangci.yml.tpl
module: github.com/getoutreach/stencil-template-base
- name: scripts/shell-wrapper.sh
template: scripts/shell-wrapper.sh.tpl
module: github.com/getoutreach/stencil-base
- name: templates/main_test.go
template: templates/main_test.go.tpl
module: github.com/getoutreach/stencil-template-base

0 comments on commit 512bfaf

Please sign in to comment.