upgrade pulumi version to 1.12.0 (sourcegraph#544)

ggilmore · web-flow · commit 3116aec34bf1 · 2020-03-10T16:11:01.000-07:00
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -1,10 +1,20 @@
 #!/usr/bin/env bash
 
 set -eu
-cd $BUILDKITE_BUILD_CHECKOUT_PATH
+pushd $(dirname "${BASH_SOURCE[0]}")/../..
 
-echo "Installing asdf dependencies as defined in '$BUILDKITE_BUILD_CHECKOUT_PATH/.tool-versions':"
-asdf install
+TOOL_VERSION_FILES=()
+mapfile -d $'\0' TOOL_VERSION_FILES < <(fd .tool-versions --hidden --absolute-path --print0)
 
-asdf global kubectl 1.17.3
+for file in "${TOOL_VERSION_FILES[@]}"
+do
+    echo "Installing asdf dependencies as defined in ${file}:"
+    parent=$(dirname "${file}")
+    pushd "${parent}"
+    
+    asdf install
+    
+    popd
+done
 
+popd
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -5,6 +5,8 @@ steps:
     command: .buildkite/verify-label.sh
   - label: ":k8s:"
     command: .buildkite/verify-rbac-labels.sh
+  - label: ':lipstick:'
+    command: .buildkite/prettier-check.sh
 
   - wait
 
diff --git a/.buildkite/prettier-check.sh b/.buildkite/prettier-check.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+cd $(dirname "${BASH_SOURCE[0]}")/..
+set -euxo pipefail
+
+cd tests/integration/fresh/step1 
+
+yarn
+
+yarn run prettier-check 
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+12.16.1
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,5 @@
+golang 1.14
+yarn 1.22.4
+kubectl 1.17.3
+pulumi 1.12.0
+fd 7.4.0
diff --git a/.tools-versions b/.tools-versions
diff --git a/go.mod b/go.mod
@@ -1,15 +1,12 @@
 module github.com/sourcegraph/deploy-sourcegraph
 
-go 1.13
+go 1.14
 
 require (
 	github.com/docker/docker v1.13.1 // indirect
 	github.com/frankban/quicktest v1.4.2
-	github.com/pulumi/pulumi v1.0.0
+	github.com/pulumi/pulumi v1.12.0
 	github.com/sethgrid/pester v0.0.0-20190127155807-68a33a018ad0
-	github.com/stretchr/testify v1.4.0 // indirect
-	golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect
-	google.golang.org/appengine v1.5.0 // indirect
 )
 
-replace golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 => golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
+replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.4.3+incompatible
diff --git a/go.sum b/go.sum
diff --git a/tests/integration/fresh/step1/.nvrmc b/tests/integration/fresh/step1/.nvrmc
@@ -0,0 +1 @@
+12.16.1
diff --git a/tests/integration/fresh/step1/.tool-versions b/tests/integration/fresh/step1/.tool-versions
@@ -0,0 +1,2 @@
+yarn 1.22.4
+pulumi 1.12.0
diff --git a/tests/integration/fresh/step1/cluster.ts b/tests/integration/fresh/step1/cluster.ts
@@ -74,4 +74,4 @@ export const k8sProvider = new k8s.Provider(`${name}-provider`, {
     kubeconfig,
 })
 
-export const clusterName = cluster.name
+export const clusterName = cluster.name
diff --git a/tests/integration/fresh/step1/index.ts b/tests/integration/fresh/step1/index.ts
@@ -1,11 +1,11 @@
 import * as os from 'os'
 import * as path from 'path'
 
+import * as fg from 'fast-glob'
 import * as k8s from '@pulumi/kubernetes'
 
 import { k8sProvider } from './cluster'
 import { deploySourcegraphRoot, gcpUsername } from './config'
-import * as fs from "fs";
 
 const clusterAdmin = new k8s.rbac.v1.ClusterRoleBinding(
     'cluster-admin-role-binding',
@@ -48,43 +48,48 @@ const storageClass = new k8s.storage.v1.StorageClass(
     { provider: k8sProvider }
 )
 
-const getAllButKustomizeYAMLFiles = dir =>
-    fs.readdirSync(dir).reduce((files, file) => {
-        if (file == 'kustomization.yaml') {
-            return files;
-        }
-        const ext = file.substr(file.lastIndexOf('.') + 1);
-        const name = path.join(dir, file);
-        const isDirectory = fs.statSync(name).isDirectory();
-        if (!isDirectory && ext != 'yaml') {
-            return files;
-        }
-        return isDirectory ? [...files, ...getAllButKustomizeYAMLFiles(name)] : [...files, name];
-    }, []);
+const globOptions = {
+    ignore: ['**/kustomization.yaml'],
+}
 
-const baseDeployment = new k8s.yaml.ConfigGroup(
-    'base',
-    {
-        files: getAllButKustomizeYAMLFiles(path.posix.join(deploySourcegraphRoot, 'base')),
-    },
-    {
-        providers: { kubernetes: k8sProvider },
-        dependsOn: [clusterAdmin, storageClass],
-    }
+const baseFiles = fg(`${path.posix.join(deploySourcegraphRoot, 'base')}/**/*.yaml`, globOptions)
+
+const baseDeployment = baseFiles.then(
+    files =>
+        new k8s.yaml.ConfigGroup(
+            'base',
+            {
+                files,
+            },
+            {
+                providers: { kubernetes: k8sProvider },
+                dependsOn: [clusterAdmin, storageClass],
+            }
+        )
 )
 
-const ingressNginx = new k8s.yaml.ConfigGroup(
-    'ingress-nginx',
-    {
-        files: `${path.posix.join(deploySourcegraphRoot, 'configure', 'ingress-nginx')}/**/*.yaml`,
-    },
-    { providers: { kubernetes: k8sProvider }, dependsOn: clusterAdmin }
+const ingressNginxFiles = fg(
+    `${path.posix.join(deploySourcegraphRoot, 'configure', 'ingress-nginx')}/**/*.yaml`,
+    globOptions
 )
 
-export const ingressIP = ingressNginx
-    .getResource('v1/Service', 'ingress-nginx', 'ingress-nginx')
-    .apply(svc => svc.status)
-    .apply(status => status.loadBalancer.ingress.map(i => i.ip))
-    .apply(ips => (ips.length === 1 ? ips[0] : undefined))
+const ingressNginx = ingressNginxFiles.then(
+    files =>
+        new k8s.yaml.ConfigGroup(
+            'ingress-nginx',
+            {
+                files,
+            },
+            { providers: { kubernetes: k8sProvider }, dependsOn: clusterAdmin }
+        )
+)
+
+export const ingressIP = ingressNginx.then(ingress =>
+    ingress
+        .getResource('v1/Service', 'ingress-nginx', 'ingress-nginx')
+        .apply(svc => svc.status)
+        .apply(status => status.loadBalancer.ingress.map(i => i.ip))
+        .apply(ips => (ips.length === 1 ? ips[0] : undefined))
+)
 
 export * from './cluster'
diff --git a/tests/integration/fresh/step1/package.json b/tests/integration/fresh/step1/package.json
@@ -1,16 +1,21 @@
 {
   "name": "steps",
+  "scripts": {
+    "prettier": "prettier '**/{*.{js?(on),ts?(x),graphql,md,scss},.*.js?(on)}' --write --list-different --config prettier.config.js",
+    "prettier-check": "yarn -s run prettier --write=false"
+  },
   "devDependencies": {
     "@sourcegraph/prettierrc": "3.0.1",
     "@types/node": "latest",
+    "fast-glob": "^3.2.2",
     "prettier": "1.18.2",
     "tslint": "5.19.0",
     "tslint-config-prettier": "1.18.0"
   },
   "dependencies": {
     "@pulumi/gcp": "1.3.0",
     "@pulumi/kubernetes": "1.2.2",
-    "@pulumi/pulumi": "1.3.1",
+    "@pulumi/pulumi": "1.12.0",
     "change-case": "^3.1.0"
   }
 }
diff --git a/tests/integration/fresh/step1/prettier.config.js b/tests/integration/fresh/step1/prettier.config.js
@@ -1 +1 @@
-module.exports = require("@sourcegraph/prettierrc");
+module.exports = require('@sourcegraph/prettierrc')
diff --git a/tests/integration/fresh/step1/yarn.lock b/tests/integration/fresh/step1/yarn.lock
diff --git a/yarn.lock b/yarn.lock
