fix(deps): update xtools (#127)

* fix(deps): update xtools * re-stencil(stable)
getoutreach · Mar 14, 2024 · 72d7200 · 72d7200
1 parent fe76a25
commit 72d7200
Show file tree

Hide file tree

Showing 12 changed files with 104 additions and 100 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,8 +2,8 @@
 # syntax, such as anchors, will be fixed automatically.
 version: 2.1
 orbs:
-  shared: getoutreach/shared@dev:first
-  queue: eddiewebb/queue@1.8.4
+  shared: getoutreach/shared@2.25.1
+  queue: eddiewebb/queue@2.2.1
 
 parameters:
   rebuild_cache:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,7 @@ updates:
     # stencil-golang managed dependencies
     ignore:
       - dependency-name: github.com/getoutreach/gobox
+      - dependency-name: github.com/getoutreach/stencil-golang/pkg
       - dependency-name: github.com/getoutreach/services
       - dependency-name: github.com/getoutreach/datastores/v2
       - dependency-name: github.com/getoutreach/mint

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,16 +1,17 @@
 <!--
   !!!! README !!!! Please fill this out.
 
-  Please follow the PR naming conventions: 
-  https://outreach-io.atlassian.net/wiki/spaces/EN/pages/1902444645/Conventional+Commits
+  Please follow conventional commit naming conventions:
+
+  https://www.conventionalcommits.org/en/v1.0.0/#summary
 -->
 
+Please read [CONTRIBUTING.md](CONTRIBUTING.md) for additional information on contributing to this repository!
 
 <!-- A short description of what your PR does and what it solves. -->
 ## What this PR does / why we need it
 
 
-
 <!-- <<Stencil::Block(jiraPrefix)>> -->
 
 **JIRA ID**: XX-XX
@@ -20,8 +21,6 @@
 <!-- Notes that may be helpful for anyone reviewing this PR -->
 ## Notes for your reviewers
 
-
-
 <!-- <<Stencil::Block(custom)>> -->
 
 <!-- <</Stencil::Block>> -->
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,9 @@ Pulumi.*.yaml
 # Documentation output
 /apidocs
 
+# Terraform lock files
+.terraform.lock.hcl
+
 ### Start ignores inserted by other modules
 ### End ignores inserted by other modules
 

diff --git a/.tool-versions b/.tool-versions
@@ -4,10 +4,10 @@
 # you are reducing compatibility guarantees.
 ## <<Stencil::Block(toolverOverride)>>
 ## <</Stencil::Block>>
-terraform 1.4.4
+nodejs 18.17.1
 protoc 21.5
-nodejs 18.14.1
-golang 1.20.7
+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
 # while leaving the 'default' version intact for the infra.

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -36,16 +36,16 @@
           "to": "/home/dev/app"
         },
         // Maps the go module cache on the host to the persistent volume used by devspaces.
-        // See the value of `go env GOMODCACHE` on the host and devspace.
+        // These should be the respective values of `go env GOMODCACHE`.
         {
-          "from": "${env:HOME}/.asdf/installs/golang/1.20.7/packages/pkg/mod",
-          "to": "/tmp/cache/go/mod/"
+          "from": "${env:HOME}/.asdf/installs/golang/1.21.5/packages/pkg/mod",
+          "to": "/home/dev/.asdf/installs/golang/1.21.5/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.20.7/go/src",
-          "to": "/home/dev/.asdf/installs/golang/1.20.7/go/src"
+          "from": "${env:HOME}/.asdf/installs/golang/1.21.5/go/src",
+          "to": "/home/dev/.asdf/installs/golang/1.21.5/go/src"
         }
       ]
     },

diff --git a/cortex.yaml b/cortex.yaml
@@ -0,0 +1,63 @@
+# Docs: https://docs.cortex.io/docs/reference/basics/entities#service-entities
+
+openapi: 3.0.0
+info:
+  title: lintroller
+  description: >
+    Lintroller houses all of the custom linters that Outreach uses for Go projects.
+  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: lintroller
+  x-cortex-git:
+    github:
+      repository: getoutreach/lintroller
+  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/lintroller#section-readme
+    ## <<Stencil::Block(customLinks)>>
+    ## <</Stencil::Block>>
+  x-cortex-custom-metadata:
+    app: lintroller
+    name: lintroller
+    repo: https://github.com/getoutreach/lintroller
+    framework: stencil
+    language: Golang
+    stencil_version: v1.37.3
+    golang_version: 1.21.5
+    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
diff --git a/go.mod b/go.mod
@@ -3,9 +3,9 @@ module github.com/getoutreach/lintroller
 go 1.19
 
 require (
-	github.com/getoutreach/gobox v1.73.2
+	github.com/getoutreach/gobox v1.89.0
 	github.com/pkg/errors v0.9.1
-	golang.org/x/tools v0.18.0
+	golang.org/x/tools v0.19.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.1
 )
@@ -16,7 +16,7 @@ require (
 )
 
 require (
-	github.com/google/go-cmp v0.5.9 // indirect
-	golang.org/x/mod v0.15.0 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	golang.org/x/mod v0.16.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/opslevel.yml b/opslevel.yml
diff --git a/service.yaml b/service.yaml
@@ -16,9 +16,7 @@ arguments:
 modules:
   - name: github.com/getoutreach/stencil-base
   - name: github.com/getoutreach/stencil-golang
-    channel: unstable
   - name: github.com/getoutreach/devbase
-    channel: main
   - name: github.com/getoutreach/stencil-outreach
   - name: github.com/getoutreach/stencil-circleci
   - name: github.com/getoutreach/stencil-actions

diff --git a/stencil.lock b/stencil.lock
@@ -1,26 +1,26 @@
-version: v1.36.0
+version: v1.37.3
 modules:
     - name: github.com/getoutreach/devbase
       url: https://github.com/getoutreach/devbase
-      version: main
+      version: v2.25.1
     - name: github.com/getoutreach/stencil-actions
       url: https://github.com/getoutreach/stencil-actions
-      version: v0.3.0
+      version: v0.4.0
     - name: github.com/getoutreach/stencil-base
       url: https://github.com/getoutreach/stencil-base
-      version: v0.12.0
+      version: v0.15.1
     - name: github.com/getoutreach/stencil-circleci
       url: https://github.com/getoutreach/stencil-circleci
-      version: v1.10.0
+      version: v1.12.0
     - name: github.com/getoutreach/stencil-discovery
       url: https://github.com/getoutreach/stencil-discovery
-      version: v1.8.0
+      version: v1.8.2
     - name: github.com/getoutreach/stencil-golang
       url: https://github.com/getoutreach/stencil-golang
-      version: unstable
+      version: v1.20.0
     - name: github.com/getoutreach/stencil-outreach
       url: https://github.com/getoutreach/stencil-outreach
-      version: v0.12.2
+      version: v0.20.4
     - name: github.com/getoutreach/stencil-pipeline
       url: https://github.com/getoutreach/stencil-pipeline
       version: v1.1.0
@@ -76,27 +76,21 @@ files:
     - name: .vscode/settings.json
       template: .vscode/settings.json.tpl
       module: github.com/getoutreach/stencil-golang
-    - 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: Makefile
       template: Makefile.tpl
       module: github.com/getoutreach/stencil-golang
-    - name: README.md
-      template: README.md.tpl
-      module: github.com/getoutreach/stencil-base
+    - name: cortex.yaml
+      template: cortex.yaml.tpl
+      module: github.com/getoutreach/stencil-outreach
     - name: devenv.yaml
       template: devenv.yaml.tpl
       module: github.com/getoutreach/stencil-golang
     - name: go.mod
       template: go.mod.tpl
       module: github.com/getoutreach/stencil-golang
-    - name: opslevel.yml
-      template: opslevel.yml.tpl
-      module: github.com/getoutreach/stencil-outreach
     - name: package.json
       template: package.json.tpl
       module: github.com/getoutreach/stencil-base