Cleanup #69

* remove osweek branches from workflow files * fix typos * explicitly use python3
eclipse-theia · Nov 24, 2023 · 57ece7f · 57ece7f
1 parent 81269b9
commit 57ece7f
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/docker-landing-page.yml b/.github/workflows/docker-landing-page.yml
@@ -1,10 +1,10 @@
-name: Docker landing Page CI
+name: Docker Landing Page CI
 
 on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, osweek23 ]
+    branches: [ main ]
 
 jobs:
 

diff --git a/.github/workflows/docker-operator.yml b/.github/workflows/docker-operator.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, osweek23 ]
+    branches: [ main ]
 
 jobs:
 

diff --git a/.github/workflows/docker-try-now-page.yml b/.github/workflows/docker-try-now-page.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, osweek23 ]
+    branches: [ main ]
 
 jobs:
 

diff --git a/.github/workflows/docker-wondershaper.yml b/.github/workflows/docker-wondershaper.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, osweek23 ]
+    branches: [ main ]
 
 jobs:
 

diff --git a/.github/workflows/service-ci.yml b/.github/workflows/service-ci.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main, osweek23 ]
+    branches: [ main ]
 
 jobs:
 

diff --git a/doc/docs/Building-Internal.md b/doc/docs/Building-Internal.md
@@ -62,7 +62,7 @@ docker build --no-cache -t theiacloud/theia-cloud-operator:latest -f dockerfiles
 docker push theiacloud/theia-cloud-operator:latest
 ```
 
-Build and pish the git-init container:
+Build and push the git-init container:
 
 ```bash
 docker build -t theiacloud/theia-cloud-git-init:latest -f dockerfiles/git-init/Dockerfile .

diff --git a/dockerfiles/git-init/Dockerfile b/dockerfiles/git-init/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:11-slim
 
 RUN apt update && \
-    apt install python git -y && \
+    apt install python3 git -y && \
     apt clean && \
     mkdir /user && \
     chmod 777 /user && \

diff --git a/...a.cloud.common/src/main/java/org/eclipse/theia/cloud/common/k8s/resource/SessionSpec.java b/...a.cloud.common/src/main/java/org/eclipse/theia/cloud/common/k8s/resource/SessionSpec.java
@@ -179,7 +179,7 @@ public List<String> getEnvVarsFromSecrets() {
 	return envVarsFromSecrets;
     }
 
-    public List<InitOperation> getinitOperations() {
+    public List<InitOperation> getInitOperations() {
 	return initOperations;
     }
 
@@ -279,10 +279,9 @@ public boolean equals(Object obj) {
     @Override
     public String toString() {
 	return "SessionSpec [name=" + name + ", appDefinition=" + appDefinition + ", user=" + user + ", url=" + url
-		+ ", error=" + error + ", workspace=" + workspace + ", lastActivity=" + lastActivity
-		+ ", sessionSecret=" + sessionSecret + ", envVars=" + envVars + ", envVarsFromConfigMaps="
-		+ envVarsFromConfigMaps + ", envVarsFromSecrets=" + envVarsFromSecrets + ", initOperations="
-		+ initOperations + "]";
+		+ ", error=" + error + ", workspace=" + workspace + ", lastActivity=" + lastActivity + ", envVars="
+		+ envVars + ", envVarsFromConfigMaps=" + envVarsFromConfigMaps + ", envVarsFromSecrets="
+		+ envVarsFromSecrets + ", initOperations=" + initOperations + "]";
     }
 
     public static boolean isEphemeral(String workspace) {

diff --git a/...perator/src/main/java/org/eclipse/theia/cloud/operator/handler/impl/AddedHandlerUtil.java b/...perator/src/main/java/org/eclipse/theia/cloud/operator/handler/impl/AddedHandlerUtil.java
@@ -344,7 +344,7 @@ private static Optional<Integer> findContainerIdxInDeployment(Deployment deploym
 
     public static void addInitContainers(String correlationId, TheiaCloudClient client, Deployment deployment,
 	    AppDefinition appDefinition, Session session, Set<InitOperationHandler> initOperationHandlers) {
-	List<InitOperation> initOperations = session.getSpec().getinitOperations();
+	List<InitOperation> initOperations = session.getSpec().getInitOperations();
 	if (initOperations == null) {
 	    return;
 	}

diff --git a/.../src/main/java/org/eclipse/theia/cloud/operator/handler/impl/GitInitOperationHandler.java b/.../src/main/java/org/eclipse/theia/cloud/operator/handler/impl/GitInitOperationHandler.java
@@ -61,6 +61,7 @@ public class GitInitOperationHandler implements InitOperationHandler {
     protected static final String IMAGE_ENV_KEY = "GIT_INIT_OPERATION_IMAGE";
     protected static final String DEFAULT_IMAGE = "theiacloud/theia-cloud-git-init:latest";
     protected static final String ID = "git";
+    protected static final String INIT_CONTAINER_NAME = "git-init";
 
     private static final Logger LOGGER = LogManager.getLogger(GitInitOperationHandler.class);
 
@@ -93,7 +94,7 @@ public void addInitContainer(String correlationId, TheiaCloudClient client, Depl
 	Container gitInitContainer = new Container();
 	initContainers.add(gitInitContainer);
 
-	gitInitContainer.setName("git-init");
+	gitInitContainer.setName(INIT_CONTAINER_NAME);
 	gitInitContainer.setImage(getImage());
 	String repository = args.get(0);
 	String branch = args.get(1);

diff --git a/python/git-init/entrypoint.sh b/python/git-init/entrypoint.sh
@@ -19,4 +19,4 @@ touch $HOME/.ssh/known_hosts
 [ -e /etc/theia-cloud-ssh/id_theiacloud ] && { sleep 1; echo $GIT_PROMPT1; } | script -q /dev/null -c 'ssh-add /etc/theia-cloud-ssh/id_theiacloud'
 
 # hand over to clone script
-python git-init.py "$@"
+python3 git-init.py "$@"
diff --git a/python/git-init/git-askpw.py b/python/git-init/git-askpw.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os
 
 path = "/tmp/theia-cloud-askpw"

diff --git a/python/git-init/git-init.py b/python/git-init/git-init.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import argparse
 import subprocess