Skip to content

Commit 2aebaf4

Browse files
jaredallardjaredallard
authored
fix: re-stencil, cleanup service.yaml (#21)
Removes some keys from `service.yaml` and re-runs `stencil`. That's it.
1 parent e58948b commit 2aebaf4

File tree

9 files changed

+198
-280
lines changed

9 files changed

+198
-280
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# syntax, such as anchors, will be fixed automatically.
33
version: 2.1
44
orbs:
5-
shared: getoutreach/shared@2.17.0
5+
shared: getoutreach/shared@2.19.2
66
queue: eddiewebb/[email protected]
77

88
parameters:
@@ -16,7 +16,6 @@ contexts: &contexts
1616
- ghaccesstoken
1717
- docker-registry
1818
- npm-credentials
19-
- prismacloud-credentials
2019
- vault-dev
2120
- confluence
2221
- circleci-credentials

‎.github/pull_request_template.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<!--
22
!!!! README !!!! Please fill this out.
33
4-
Please follow the PR naming conventions:
5-
https://outreach-io.atlassian.net/wiki/spaces/EN/pages/1902444645/Conventional+Commits
4+
Please follow conventional commit naming conventions:
5+
6+
https://www.conventionalcommits.org/en/v1.0.0/#summary
67
-->
78

9+
Please read [CONTRIBUTING.md](CONTRIBUTING.md) for additional information on contributing to this repository!
810

911
<!-- A short description of what your PR does and what it solves. -->
1012
## What this PR does / why we need it
1113

1214

13-
1415
<!-- <<Stencil::Block(jiraPrefix)>> -->
1516

1617
## Jira ID
@@ -22,8 +23,6 @@
2223
<!-- Notes that may be helpful for anyone reviewing this PR -->
2324
## Notes for your reviewers
2425

25-
26-
2726
<!-- <<Stencil::Block(custom)>> -->
2827

2928
<!-- <</Stencil::Block>> -->

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ Pulumi.*.yaml
6161
# Documentation output
6262
/apidocs
6363

64+
# Terraform lock files
65+
.terraform.lock.hcl
66+
6467
### Start ignores inserted by other modules
6568
### End ignores inserted by other modules
6669

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
## <<Stencil::Block(toolverOverride)>>
66
## <</Stencil::Block>>
77
golang 1.19.11
8+
nodejs 18.17.1
89
terraform 1.4.4
910
protoc 21.5
10-
nodejs 18.14.1
1111
# Note: Versions in this block do not override the default versions above
1212
# but sometimes you have to declare additional versions of the same tool
1313
# while leaving the 'default' version intact for the infra.

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
},
1515
"go.buildTags": "or_dev",
1616
"go.testTags": "or_test,or_int,or_e2e",
17+
"files.trimTrailingWhitespace": true,
1718
// This prevents 99% of issues with linters :)
1819
"editor.formatOnSave": true,
1920
"shellcheck.customArgs": ["-P", "SCRIPTDIR", "-x"],

‎go.mod‎

Lines changed: 55 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,109 +4,114 @@ go 1.19
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.2.3
7-
github.com/getoutreach/gobox v1.71.0
7+
github.com/getoutreach/gobox v1.77.0
88
github.com/itchyny/gojq v0.12.13
99
github.com/sirupsen/logrus v1.9.3
10-
github.com/urfave/cli/v2 v2.16.3
10+
github.com/urfave/cli/v2 v2.25.7
1111
gotest.tools/v3 v3.5.0
1212
)
1313

1414
require (
15-
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
16-
github.com/creack/pty v1.1.17 // indirect
17-
github.com/json-iterator/go v1.1.12 // indirect
18-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
19-
github.com/modern-go/reflect2 v1.0.2 // indirect
20-
)
21-
22-
require (
15+
dario.cat/mergo v1.0.0 // indirect
2316
github.com/Masterminds/goutils v1.1.1 // indirect
24-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
25-
github.com/Microsoft/go-winio v0.5.2 // indirect
26-
github.com/ProtonMail/go-crypto v0.0.0-20220407094043-a94812496cf5 // indirect
27-
github.com/acomagu/bufpipe v1.0.3 // indirect
17+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
18+
github.com/Microsoft/go-winio v0.6.1 // indirect
19+
github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
20+
github.com/acomagu/bufpipe v1.0.4 // indirect
2821
github.com/alecthomas/chroma v0.10.0 // indirect
22+
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
2923
github.com/aymerick/douceur v0.2.0 // indirect
3024
github.com/beorn7/perks v1.0.1 // indirect
3125
github.com/briandowns/spinner v1.23.0 // indirect
32-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
26+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3327
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3428
github.com/charmbracelet/glamour v0.6.0 // indirect
3529
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
30+
github.com/cloudflare/circl v1.3.3 // indirect
3631
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
32+
github.com/creack/pty v1.1.18 // indirect
3733
github.com/davecgh/go-spew v1.1.1 // indirect
3834
github.com/dlclark/regexp2 v1.4.0 // indirect
39-
github.com/emirpasic/gods v1.12.1 // indirect
40-
github.com/fatih/color v1.13.0 // indirect
35+
github.com/emirpasic/gods v1.18.1 // indirect
36+
github.com/fatih/color v1.15.0 // indirect
4137
github.com/felixge/httpsnoop v1.0.3 // indirect
42-
github.com/go-git/gcfg v1.5.0 // indirect
43-
github.com/go-git/go-billy/v5 v5.3.1 // indirect
44-
github.com/go-git/go-git/v5 v5.4.2 // indirect
45-
github.com/go-logr/logr v1.2.3 // indirect
38+
github.com/fynelabs/selfupdate v0.2.0 // indirect
39+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
40+
github.com/go-git/go-billy/v5 v5.4.1 // indirect
41+
github.com/go-git/go-git/v5 v5.8.1 // indirect
42+
github.com/go-logr/logr v1.2.4 // indirect
4643
github.com/go-logr/stdr v1.2.2 // indirect
47-
github.com/golang/protobuf v1.5.2 // indirect
44+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
45+
github.com/golang/protobuf v1.5.3 // indirect
4846
github.com/google/go-cmp v0.5.9 // indirect
49-
github.com/google/go-github/v47 v47.0.0 // indirect
47+
github.com/google/go-github/v53 v53.2.0 // indirect
5048
github.com/google/go-querystring v1.1.0 // indirect
5149
github.com/google/uuid v1.3.0 // indirect
5250
github.com/gorilla/css v1.0.0 // indirect
5351
github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.3 // indirect
54-
github.com/honeycombio/beeline-go v1.11.1 // indirect
52+
github.com/honeycombio/beeline-go v1.13.0 // indirect
5553
github.com/huandu/xstrings v1.3.3 // indirect
5654
github.com/imdario/mergo v0.3.13 // indirect
57-
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
5855
github.com/itchyny/timefmt-go v0.1.5 // indirect
5956
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
57+
github.com/json-iterator/go v1.1.12 // indirect
6058
github.com/kevinburke/ssh_config v1.2.0 // indirect
6159
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
6260
github.com/manifoldco/promptui v0.9.0 // indirect
63-
github.com/mattn/go-colorable v0.1.12 // indirect
61+
github.com/mattn/go-colorable v0.1.13 // indirect
6462
github.com/mattn/go-isatty v0.0.19 // indirect
6563
github.com/mattn/go-runewidth v0.0.14 // indirect
66-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
64+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6765
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
6866
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
6967
github.com/mitchellh/copystructure v1.1.1 // indirect
70-
github.com/mitchellh/go-homedir v1.1.0 // indirect
7168
github.com/mitchellh/reflectwalk v1.0.1 // indirect
69+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
70+
github.com/modern-go/reflect2 v1.0.2 // indirect
7271
github.com/muesli/reflow v0.3.0 // indirect
7372
github.com/muesli/termenv v0.13.0 // indirect
7473
github.com/olekukonko/tablewriter v0.0.5 // indirect
74+
github.com/pjbgf/sha1cd v0.3.0 // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
76-
github.com/prometheus/client_golang v1.14.0 // indirect
76+
github.com/prometheus/client_golang v1.16.0 // indirect
7777
github.com/prometheus/client_model v0.3.0 // indirect
78-
github.com/prometheus/common v0.37.0 // indirect
79-
github.com/prometheus/procfs v0.8.0 // indirect
78+
github.com/prometheus/common v0.42.0 // indirect
79+
github.com/prometheus/procfs v0.10.1 // indirect
8080
github.com/rivo/uniseg v0.4.4 // indirect
8181
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8282
github.com/schollz/progressbar/v3 v3.13.1 // indirect
8383
github.com/sergi/go-diff v1.2.0 // indirect
8484
github.com/shopspring/decimal v1.3.1 // indirect
85+
github.com/skeema/knownhosts v1.2.0 // indirect
8586
github.com/spf13/cast v1.4.1 // indirect
86-
github.com/ulikunitz/xz v0.5.10 // indirect
87-
github.com/xanzy/ssh-agent v0.3.1 // indirect
87+
github.com/ulikunitz/xz v0.5.11 // indirect
88+
github.com/xanzy/ssh-agent v0.3.3 // indirect
8889
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
8990
github.com/yuin/goldmark v1.5.2 // indirect
9091
github.com/yuin/goldmark-emoji v1.0.1 // indirect
91-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.33.0 // indirect
92-
go.opentelemetry.io/otel v1.14.0 // indirect
93-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
94-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
95-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
96-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
97-
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
98-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
92+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
93+
go.opentelemetry.io/otel v1.16.0 // indirect
94+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
95+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
96+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.16.0 // indirect
98+
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
99+
go.opentelemetry.io/otel/trace v1.16.0 // indirect
99100
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
100-
golang.org/x/crypto v0.3.0 // indirect
101-
golang.org/x/net v0.7.0 // indirect
102-
golang.org/x/oauth2 v0.4.0 // indirect
103-
golang.org/x/sys v0.8.0 // indirect
104-
golang.org/x/term v0.6.0 // indirect
105-
golang.org/x/text v0.7.0 // indirect
101+
golang.org/x/crypto v0.12.0 // indirect
102+
golang.org/x/mod v0.12.0 // indirect
103+
golang.org/x/net v0.14.0 // indirect
104+
golang.org/x/oauth2 v0.11.0 // indirect
105+
golang.org/x/sys v0.11.0 // indirect
106+
golang.org/x/term v0.11.0 // indirect
107+
golang.org/x/text v0.12.0 // indirect
108+
golang.org/x/tools v0.12.0 // indirect
106109
google.golang.org/appengine v1.6.7 // indirect
107-
google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa // indirect
108-
google.golang.org/grpc v1.53.0 // indirect
109-
google.golang.org/protobuf v1.28.1 // indirect
110+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
111+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
112+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
113+
google.golang.org/grpc v1.57.0 // indirect
114+
google.golang.org/protobuf v1.31.0 // indirect
110115
gopkg.in/warnings.v0 v0.1.2 // indirect
111116
gopkg.in/yaml.v3 v3.0.1 // indirect
112117
)

0 commit comments

Comments
 (0)