Skip to content

Commit 7852b7d

Browse files
fix(stencil): upgrade modules (2024-04-02) (#36)
Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com>
1 parent c505cbf commit 7852b7d

File tree

16 files changed

+415
-759
lines changed

16 files changed

+415
-759
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# syntax, such as anchors, will be fixed automatically.
33
version: 2.1
44
orbs:
5-
shared: getoutreach/shared@2.17.0
6-
queue: eddiewebb/queue@1.8.4
5+
shared: getoutreach/shared@2.26.0
6+
queue: eddiewebb/queue@2.2.1
77

88
parameters:
99
rebuild_cache:
@@ -16,11 +16,11 @@ contexts: &contexts
1616
- ghaccesstoken
1717
- docker-registry
1818
- npm-credentials
19-
- prismacloud-credentials
2019
- vault-dev
2120
- confluence
2221
- circleci-credentials
2322
- tray-webhooks
23+
- wizcli
2424
## <<Stencil::Block(extraContexts)>>
2525

2626
## <</Stencil::Block>>

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ updates:
88
# stencil-golang managed dependencies
99
ignore:
1010
- dependency-name: github.com/getoutreach/gobox
11+
- dependency-name: github.com/getoutreach/stencil-golang/pkg
1112
- dependency-name: github.com/urfave/cli/v2
1213
- dependency-name: github.com/getoutreach/services
1314
- dependency-name: github.com/getoutreach/datastores/v2

.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

.goreleaser.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ builds:
1818
- '-X "main.TeleforkAPIKey={{ .Env.TELEFORK_APIKEY }}"'
1919
env:
2020
- CGO_ENABLED=0
21+
### <<Stencil::Block(ghaccesstokenAdditionalEnv)>>
22+
23+
### <</Stencil::Block>>
2124

2225
archives: []
2326
checksum:

.tool-versions

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
# you are reducing compatibility guarantees.
55
## <<Stencil::Block(toolverOverride)>>
66
## <</Stencil::Block>>
7-
golang 1.19.11
8-
terraform 1.4.4
7+
golang 1.22.0
8+
nodejs 18.17.1
99
protoc 21.5
10-
nodejs 18.14.1
10+
terraform 1.5.7
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/launch.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636
"to": "/home/dev/app"
3737
},
3838
// Maps the go module cache on the host to the persistent volume used by devspaces.
39-
// See the value of `go env GOMODCACHE` on the host and devspace.
39+
// These should be the respective values of `go env GOMODCACHE`.
4040
{
41-
"from": "${env:HOME}/.asdf/installs/golang/1.19.11/packages/pkg/mod",
42-
"to": "/tmp/cache/go/mod/"
41+
"from": "${env:HOME}/.asdf/installs/golang/1.22.0/packages/pkg/mod",
42+
"to": "/home/dev/.asdf/installs/golang/1.22.0/packages/pkg/mod"
4343
},
4444
{
4545
// Maps the standard library location on the host to the location in the devspace.
4646
// This enables debugging standard library code.
47-
"from": "${env:HOME}/.asdf/installs/golang/1.19.11/go/src",
48-
"to": "/home/dev/.asdf/installs/golang/1.19.11/go/src"
47+
"from": "${env:HOME}/.asdf/installs/golang/1.22.0/go/src",
48+
"to": "/home/dev/.asdf/installs/golang/1.22.0/go/src"
4949
}
5050
]
5151
},

.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"],

cmd/ghaccesstoken/ghaccesstoken.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023 Outreach Corporation. All Rights Reserved.
1+
// Copyright 2024 Outreach Corporation. All Rights Reserved.
22

33
// Description: This file is the entrypoint for the ghaccesstoken CLI
44
// command for ci.

cortex.yaml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Docs: https://docs.cortex.io/docs/reference/basics/entities#service-entities
2+
3+
openapi: 3.0.0
4+
info:
5+
title: ci
6+
description: >
7+
Collection of utilities for use in CI @ Outreach
8+
x-cortex-type: service
9+
x-cortex-slack:
10+
channels:
11+
- name: dev-tooling-design
12+
notificationsEnabled: false
13+
- name: dev-tooling-support
14+
notificationsEnabled: false
15+
- name: dt-oncall
16+
notificationsEnabled: true
17+
- name: fnd-dt-alerts
18+
notificationsEnabled: true
19+
x-cortex-owners:
20+
- type: group
21+
name: fnd-dt
22+
provider: CORTEX
23+
x-cortex-tag: ci
24+
x-cortex-git:
25+
github:
26+
repository: getoutreach/ci
27+
x-cortex-oncall:
28+
pagerduty:
29+
id: P9HJAUT
30+
type: SERVICE
31+
x-cortex-link:
32+
## These are useful documentation links for this service. Please fill in the customLinks block if you have additional documentation links.
33+
## name: The name of the link
34+
## type: Choose one type from (dashboard,documentation,healthcheck,logs,metrics,runbook)
35+
## url: The link url
36+
## description(optional): Description to this link
37+
- name: API Docs
38+
type: api_documentation
39+
url: https://engdocs.outreach.cloud/github.com/getoutreach/ci#section-readme
40+
## <<Stencil::Block(customLinks)>>
41+
## <</Stencil::Block>>
42+
x-cortex-custom-metadata:
43+
app: ci
44+
name: ci
45+
repo: https://github.com/getoutreach/ci
46+
framework: stencil
47+
language: Golang
48+
stencil_version: v1.38.0
49+
golang_version: 1.22.0
50+
cli: true
51+
service: false
52+
product: Outreach
53+
lifecycle: in_development
54+
## <<Stencil::Block(extraAliases)>>
55+
## <</Stencil::Block>>
56+
reporting_team: fnd-dt
57+
lintroller: platinum
58+
x-cortex-groups:
59+
- lifecycle: in_development
60+
- product: Outreach
61+
- language: Golang
62+
- framework: stencil
63+
- type: cli
64+
- engOrg: fnd

0 commit comments

Comments
 (0)