Add previewctl/gpctl autocompletion to workspace image

ArthurSens · roboquat · commit 31c592f0b3d4 · 2022-06-03T13:18:52.000+05:30
Signed-off-by: ArthurSens &lt;arthursens2005@gmail.com&gt;
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
 workspaceLocation: gitpod/gitpod-ws.code-workspace
 checkoutLocation: gitpod
 ports:
diff --git a/.werft/build.yaml b/.werft/build.yaml
@@ -71,7 +71,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     resources:
diff --git a/.werft/debug.yaml b/.werft/debug.yaml
@@ -53,7 +53,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/.werft/ide-integration-tests-startup-jetbrains.yaml b/.werft/ide-integration-tests-startup-jetbrains.yaml
@@ -12,7 +12,7 @@ pod:
     emptyDir: {}
   containers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     env:
diff --git a/.werft/ide-integration-tests-startup-vscode.yaml b/.werft/ide-integration-tests-startup-vscode.yaml
@@ -12,7 +12,7 @@ pod:
     emptyDir: {}
   containers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     env:
diff --git a/.werft/ide-run-integration-tests.yaml b/.werft/ide-run-integration-tests.yaml
@@ -25,7 +25,7 @@ pod:
     emptyDir: {}
   initContainers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/.werft/platform-delete-preview-environments-cron.yaml b/.werft/platform-delete-preview-environments-cron.yaml
@@ -27,7 +27,7 @@ pod:
       secretName: harvester-vm-ssh-keys
   containers:
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/.werft/platform-trigger-werft-cleanup.yaml b/.werft/platform-trigger-werft-cleanup.yaml
@@ -21,7 +21,7 @@ pod:
         secretName: gcp-sa-gitpod-dev-deployer
   containers:
     - name: build
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
       workingDir: /workspace
       imagePullPolicy: IfNotPresent
       volumeMounts:
diff --git a/.werft/run-integration-tests.yaml b/.werft/run-integration-tests.yaml
@@ -22,7 +22,7 @@ pod:
     emptyDir: {}
   initContainers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml
@@ -14,7 +14,7 @@ pod:
       secretName: gcp-sa-gitpod-dev-deployer
   containers:
   - name: wipe-devstaging
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     volumeMounts:
diff --git a/.werft/workspace-run-integration-tests.yaml b/.werft/workspace-run-integration-tests.yaml
@@ -12,7 +12,7 @@ pod:
     emptyDir: {}
   containers:
   - name: gcloud
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3
     workingDir: /workspace
     imagePullPolicy: IfNotPresent
     env:
diff --git a/dev/BUILD.yaml b/dev/BUILD.yaml
@@ -17,6 +17,7 @@ packages:
     deps:
       - dev/gpctl:app
       - dev/kubecdl:app
+      - dev/preview/previewctl:cli
     argdeps:
       - imageRepoBase
     config:
diff --git a/dev/image/BUILD.yaml b/dev/image/BUILD.yaml
@@ -4,6 +4,7 @@ packages:
     deps:
       - dev/gpctl:app
       - dev/kubecdl:app
+      - dev/preview/previewctl:cli
     argdeps:
       - imageRepoBase
     srcs:
diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile
@@ -244,4 +244,8 @@ ENV WERFT_CREDENTIAL_HELPER=/workspace/gitpod/dev/preview/werft-credential-helpe
 
 # Copy our own tools
 ENV NEW_KUBECDL=1
-COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl /usr/bin/
+COPY dev-kubecdl--app/kubecdl dev-gpctl--app/gpctl dev-preview-previewctl--cli/previewctl /usr/bin/
+
+# Configure our tools' autocompletion
+RUN bash -c "echo . \<\(gpctl completion bash\) >> ~/.bashrc" && \
+    bash -c "echo . \<\(previewctl completion bash\) >> ~/.bashrc"
diff --git a/dev/leeway.Dockerfile b/dev/leeway.Dockerfile
@@ -4,4 +4,4 @@
 
 FROM scratch
 
-COPY dev-gpctl--app/gpctl dev-kubecdl--app/kubecdl /app/
+COPY dev-gpctl--app/gpctl dev-kubecdl--app/kubecdl dev-preview-previewctl--cli/previewctl /app/

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:af-add-gh-cli-to-dev-image.0`
	`1`	`+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:as-previewctl-completion.3`
`2`	`2`	`workspaceLocation: gitpod/gitpod-ws.code-workspace`
`3`	`3`	`checkoutLocation: gitpod`
`4`	`4`	`ports:`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@`
`4`	`4`
`5`	`5`	`FROM scratch`
`6`	`6`
`7`		`-COPY dev-gpctl--app/gpctl dev-kubecdl--app/kubecdl /app/`
	`7`	`+COPY dev-gpctl--app/gpctl dev-kubecdl--app/kubecdl dev-preview-previewctl--cli/previewctl /app/`