Skip to content

Commit

Permalink
fix(stencil): upgrade modules (2024-04-10) (#152)
Browse files Browse the repository at this point in the history
* test: use stenciltest.RegenerateSnapshots()
* test: update snapshots

---------

Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com>
Co-authored-by: Mark Lee <mark.lee@outreach.io>
  • Loading branch information
getoutreach-ci-1[bot] and malept authored Apr 10, 2024
1 parent 5dba29c commit 75a7b31
Show file tree
Hide file tree
Showing 12 changed files with 211 additions and 152 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# syntax, such as anchors, will be fixed automatically.
version: 2.1
orbs:
shared: getoutreach/shared@2.24.0
shared: getoutreach/shared@2.26.1
queue: eddiewebb/queue@2.2.1

parameters:
Expand All @@ -18,6 +18,7 @@ contexts: &contexts
- confluence
- circleci-credentials
- tray-webhooks
- wizcli
## <<Stencil::Block(extraContexts)>>
- docker-registry
- ghaccesstoken
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# you are reducing compatibility guarantees.
## <<Stencil::Block(toolverOverride)>>
## <</Stencil::Block>>
golang 1.22.0
nodejs 18.17.1
protoc 21.5
golang 1.21.5
terraform 1.5.7
# Note: Versions in this block do not override the default versions above
# but sometimes you have to declare additional versions of the same tool
Expand Down
8 changes: 4 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
// Maps the go module cache on the host to the persistent volume used by devspaces.
// These should be the respective values of `go env GOMODCACHE`.
{
"from": "${env:HOME}/.asdf/installs/golang/1.21.5/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.21.5/packages/pkg/mod"
"from": "${env:HOME}/.asdf/installs/golang/1.22.0/packages/pkg/mod",
"to": "/home/dev/.asdf/installs/golang/1.22.0/packages/pkg/mod"
},
{
// Maps the standard library location on the host to the location in the devspace.
// This enables debugging standard library code.
"from": "${env:HOME}/.asdf/installs/golang/1.21.5/go/src",
"to": "/home/dev/.asdf/installs/golang/1.21.5/go/src"
"from": "${env:HOME}/.asdf/installs/golang/1.22.0/go/src",
"to": "/home/dev/.asdf/installs/golang/1.22.0/go/src"
}
]
},
Expand Down
63 changes: 63 additions & 0 deletions cortex.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Docs: https://docs.cortex.io/docs/reference/basics/entities#service-entities

openapi: 3.0.0
info:
title: stencil-circleci
description: >
Stencil Module for CircleCI
x-cortex-type: service
x-cortex-slack:
channels:
- name: dev-tooling-design
notificationsEnabled: false
- name: dev-tooling-support
notificationsEnabled: false
- name: dt-oncall
notificationsEnabled: true
- name: fnd-dt-alerts
notificationsEnabled: true
x-cortex-owners:
- type: group
name: fnd-dt
provider: CORTEX
x-cortex-tag: stencil-circleci
x-cortex-git:
github:
repository: getoutreach/stencil-circleci
x-cortex-oncall:
pagerduty:
id: P9HJAUT
type: SERVICE
x-cortex-link:
## These are useful documentation links for this service. Please fill in the customLinks block if you have additional documentation links.
## name: The name of the link
## type: Choose one type from (dashboard,documentation,healthcheck,logs,metrics,runbook)
## url: The link url
## description(optional): Description to this link
- name: API Docs
type: api_documentation
url: https://engdocs.outreach.cloud/github.com/getoutreach/stencil-circleci#section-readme
## <<Stencil::Block(customLinks)>>
## <</Stencil::Block>>
x-cortex-custom-metadata:
app: stencil-circleci
name: stencil-circleci
repo: https://github.com/getoutreach/stencil-circleci
framework: stencil
language: Golang
stencil_version: v1.38.0
golang_version: 1.22.0
cli: false
service: false
product: Outreach
lifecycle: in_development
## <<Stencil::Block(extraAliases)>>
## <</Stencil::Block>>
reporting_team: fnd-dt
lintroller: platinum
x-cortex-groups:
- lifecycle: in_development
- product: Outreach
- language: Golang
- framework: stencil
- engOrg: fnd
43 changes: 21 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ module github.com/getoutreach/stencil-circleci

go 1.19

require github.com/getoutreach/stencil v1.37.2
require github.com/getoutreach/stencil v1.38.0

require (
dario.cat/mergo v1.0.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-github/v53 v53.2.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
github.com/google/go-github/v58 v58.0.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/tools v0.19.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
)

require (
Expand All @@ -23,24 +23,23 @@ require (
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/acomagu/bufpipe v1.0.4 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bradleyjkemp/cupaloy v2.3.0+incompatible // indirect
github.com/cloudflare/circl v1.3.3 // indirect
github.com/danieljoos/wincred v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/getoutreach/gobox v1.73.2 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/getoutreach/gobox v1.89.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.10.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-hclog v1.6.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand All @@ -52,7 +51,7 @@ require (
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mitchellh/copystructure v1.1.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand All @@ -67,21 +66,21 @@ require (
github.com/sergi/go-diff v1.2.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/skeema/knownhosts v1.2.0 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/whilp/git-urls v1.0.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zalando/go-keyring v0.2.3 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/grpc v1.57.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/grpc v1.61.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gotest.tools/v3 v3.5.1 // indirect
Expand Down
Loading

0 comments on commit 75a7b31

Please sign in to comment.