fix(stencil): upgrade modules (2023-08-07) (#114)

* fix(stencil): upgrade modules (2023-08-07) * cleanup service.yaml, disable docker and e2e step --------- Co-authored-by: getoutreach-ci-1[bot] <95656460+getoutreach-ci-1[bot]@users.noreply.github.com> Co-authored-by: Jared Allard <[email protected]>
getoutreach · Aug 7, 2023 · 978e15c · 978e15c
1 parent c48694d
commit 978e15c
Show file tree

Hide file tree

Showing 19 changed files with 1,754 additions and 2,310 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,13 @@
 # syntax, such as anchors, will be fixed automatically.
 version: 2.1
 orbs:
-  shared: getoutreach/[email protected]
+  shared: getoutreach/[email protected]
+  queue: eddiewebb/[email protected]
+
+parameters:
+  rebuild_cache:
+    type: boolean
+    default: false
 
 # Extra contexts to expose to all jobs below
 contexts: &contexts
@@ -11,14 +17,24 @@ contexts: &contexts
   - docker-registry
   - npm-credentials
   - prismacloud-credentials
-  - opslevel-credentials
   - vault-dev
   - confluence
   - circleci-credentials
+  - tray-webhooks
   ## <<Stencil::Block(extraContexts)>>
 
   ## <</Stencil::Block>>
 
+# Test configs to pass to test and cache jobs
+test: &test
+  context: *contexts
+  app_name: lintroller
+  ### Start parameters inserted by other modules
+  ### End parameters inserted by other modules
+  ## <<Stencil::Block(circleTestExtra)>>
+
+  ## <</Stencil::Block>>
+
 # Branches used for releasing code, pre-release or not
 release_branches: &release_branches
   - "main"
@@ -41,7 +57,26 @@ workflows:
   ### Start workflows inserted by other modules
   ### End workflows inserted by other modules
 
+  rebuild-cache:
+    triggers:
+      - schedule:
+          # Every day at 00:00 UTC.
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
+      - shared/save_cache: *test
+
+  manual-rebuild-cache:
+    when: << pipeline.parameters.rebuild_cache >>
+    jobs:
+      - shared/save_cache: *test
+
   release:
+    when:
+      not: << pipeline.parameters.rebuild_cache >>
     jobs:
       ## <<Stencil::Block(circleWorkflowJobs)>>
 
@@ -71,35 +106,15 @@ workflows:
             branches:
               ignore: *release_branches
       - shared/test:
-          context: *contexts
-          app_name: lintroller
-          ### Start parameters inserted by other modules
-          ### End parameters inserted by other modules
-          ## <<Stencil::Block(circleTestExtra)>>
+          <<: *test
+          ## <<Stencil::Block(circleSharedTestExtra)>>
 
           ## <</Stencil::Block>>
-
       - shared/publish_docs:
           context: *contexts
           filters:
             branches:
-              ignore: /.*/
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*(-.*)*/
-      - shared/finalize-coverage:
-          context: *contexts
-          requires:
-            - shared/e2e
-            - shared/test
-      - shared/e2e:
-          context: *contexts
-          ## <<Stencil::Block(circleE2EExtra)>>
-
-          ## <</Stencil::Block>>
-      - shared/docker:
-          context: *contexts
-          filters:
-            branches:
-              ignore: *release_branches
+              only:
+                - main
             tags:
               only: /v\d+(\.\d+)*(-.*)*/
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,10 +8,10 @@ updates:
     # stencil-golang managed dependencies
     ignore:
       - dependency-name: github.com/getoutreach/gobox
-      - dependency-name: github.com/getoutreach/mint
-      - dependency-name: github.com/getoutreach/httpx
       - dependency-name: github.com/getoutreach/services
       - dependency-name: github.com/getoutreach/datastores/v2
+      - dependency-name: github.com/getoutreach/mint
+      - dependency-name: github.com/getoutreach/httpx
 
   # Ignore semantic-release, this code is only executed in CI.
   - package-ecosystem: "npm"

diff --git a/.github/workflows/pull_request-shared-actions.yaml b/.github/workflows/pull_request-shared-actions.yaml
@@ -1,5 +1,7 @@
 name: Pull Request Shared Actions
-on: pull_request
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited] # Add edited to the default list for title changes event
 
 jobs:
   conventional_commit:

diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ TAGS
 *.sublime-project
 *.sublime-workspace
 .\#*
+.dir-locals.el
 
 # Test binary, build with "go test -c"
 *.test
@@ -60,6 +61,9 @@ Pulumi.*.yaml
 # Documentation output
 /apidocs
 
+### Start ignores inserted by other modules
+### End ignores inserted by other modules
+
 ## <<Stencil::Block(extras)>>
 
 ## <</Stencil::Block>>
diff --git a/.tool-versions b/.tool-versions
@@ -1,11 +1,16 @@
 # This file contains tool versions for use with asdf
-golang 1.19
-nodejs 16.13.0
-terraform 0.13.5
-ruby 2.7.5
+# Note: Versions in this block override the default versions below.
+# Be EXTREMELY CAREFUL with this. If you override a standard version
+# you are reducing compatibility guarantees.
+## <<Stencil::Block(toolverOverride)>>
+## <</Stencil::Block>>
+golang 1.19.11
+terraform 1.4.4
 protoc 21.5
-# Note: Versions in this block override the above. Be EXTREMELY
-# CAREFUL with this. If you override a standard version you are
-# reducing compatibility guarantees.
+nodejs 18.14.1
+# 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.
+# The most common case is nodejs.
 ## <<Stencil::Block(toolver)>>
 ## <</Stencil::Block>>
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -4,8 +4,7 @@
     "esbenp.prettier-vscode",
     "hashicorp.terraform",
     "golang.go",
-    "heptio.jsonnet",
-    "xrc-inc.jsonnet-formatter",
+    "Grafana.vscode-jsonnet",
     "timonwong.shellcheck",
     "zxh404.vscode-proto3",
     "redhat.vscode-yaml",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -24,20 +24,41 @@
       "host": "127.0.0.1",
       "port": 42097,
       // <</Stencil::Block>>
+      // Paths to replace when running the debugger. "from" is the host
+      // path and "to" is the path in the devspace.
       "substitutePath": [
         {
+          // Maps the workspace root (the repository directory) to the path that
+          // is compiled into the built binary. Note: This is not impacted by trimpath
+          // because devbase currently uses dlv to compile the source code.
+          // See: https://github.com/getoutreach/devbase/blob/main/shell/debug.sh#L72
           "from": "${workspaceRoot}",
           "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.
         {
-          "from": "${env:HOME}/.asdf/installs/golang/1.19/packages/pkg/mod",
+          "from": "${env:HOME}/.asdf/installs/golang/1.19.11/packages/pkg/mod",
           "to": "/tmp/cache/go/mod/"
         },
         {
-          "from": "${env:HOME}/.asdf/installs/golang/1.19/go/src",
-          "to": "/home/dev/.asdf/installs/golang/1.19/go/src"
+          // 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.19.11/go/src",
+          "to": "/home/dev/.asdf/installs/golang/1.19.11/go/src"
         }
       ]
+    },
+    {
+      "name": "Attach to dev container (in binary mode)",
+      "type": "go",
+      "debugAdapter": "dlv-dap",
+      "request": "attach",
+      "mode": "remote",
+      // <<Stencil::Block(vscodeRemoteDebugDevspaceBinary)>>
+      "host": "127.0.0.1",
+      "port": 42097
+      // <</Stencil::Block>>
     }
     // <<Stencil::Block(vscodeLaunchConfigs)>>
 

diff --git a/.vscode/private.env b/.vscode/private.env
@@ -1,6 +1,4 @@
 MY_NAMESPACE="lintroller--bento1a"
-OUTREACH_ACCOUNTS_BASE_URL="https://accounts.outreach-dev.com"
-OUTREACH_DOMAIN="outreach-dev.com"
 // <<Stencil::Block(vscodeEnvVars)>>
 
 // <</Stencil::Block>>
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,9 +10,7 @@
   "go.useLanguageServer": true,
   "go.testEnvFile": "${workspaceFolder}/.vscode/private.env",
   "go.alternateTools": {
-    // This makes sure we use the correct version
-    // of golangci-lint in our editors.
-    "golangci-lint": "${workspaceFolder}/.bootstrap/shell/golangci-lint.sh"
+    "golangci-lint": "${workspaceFolder}/.bootstrap/shell/vscode/golang-linters.sh"
   },
   "go.buildTags": "or_dev",
   "go.testTags": "or_test,or_int,or_e2e",

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,6 +12,8 @@
 
 ## Building and Testing
 
+This project uses devbase, which exposes the following build tooling: [devbase/docs/makefile.md](https://github.com/getoutreach/devbase/blob/main/docs/makefile.md)
+
 <!-- <<Stencil::Block(customBuildingAndTesting)>> -->
 
 <!-- <</Stencil::Block>> -->

diff --git a/go.mod b/go.mod
@@ -1,19 +1,21 @@
 module github.com/getoutreach/lintroller
 
-go 1.17
+go 1.19
 
 require (
-	github.com/getoutreach/gobox v1.54.0
+	github.com/getoutreach/gobox v1.71.0
 	github.com/pkg/errors v0.9.1
-	golang.org/x/tools v0.1.12
+	golang.org/x/tools v0.2.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.4.0
 )
 
+require github.com/rogpeppe/go-internal v1.9.0 // indirect
+
 require (
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )