auth-python: Changed Directory Structure to Support Multi-Cloud

Signed-off-by: Alan Nair <[email protected]>
manyiw99 · May 23, 2023 · cd4eec1 · cd4eec1
1 parent 5344972
commit cd4eec1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/e2e-auth.yml b/.github/workflows/e2e-auth.yml
@@ -89,7 +89,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: true
-          file: benchmarks/auth/Dockerfile
+          file: benchmarks/auth/docker/Dockerfile
           platforms: ${{ env.PLATFORMS }}
           target: ${{ matrix.target }}
           tags: vhiveease/${{ matrix.service }}:latest

diff --git a/benchmarks/auth/Makefile b/benchmarks/auth/Makefile
@@ -12,27 +12,27 @@ all_image: $(ALL_IMAGES)
 
 
 
-auth-python-image: Dockerfile python/server.py
+auth-python-image: docker/Dockerfile python/server.py
 	DOCKER_BUILDKIT=1 docker build \
 	--tag $(DOCKER_HUB_ACCOUNT)/auth-python:latest \
 	--target authPython \
-	-f Dockerfile \
+	-f docker/Dockerfile \
 	$(ROOT)
 
 
-auth-nodejs-image: Dockerfile nodejs/server.js
+auth-nodejs-image: docker/Dockerfile nodejs/server.js
 	DOCKER_BUILDKIT=1 docker build \
 	--tag $(DOCKER_HUB_ACCOUNT)/auth-nodejs:latest \
 	--target authNodeJS \
-	-f Dockerfile \
+	-f docker/Dockerfile \
 	$(ROOT)
 
 
-auth-go-image: Dockerfile go/server.go
+auth-go-image: docker/Dockerfile go/server.go
 	DOCKER_BUILDKIT=1 docker build \
 	--tag $(DOCKER_HUB_ACCOUNT)/auth-go:latest \
 	--target authGo \
-	-f Dockerfile \
+	-f docker/Dockerfile \
 	$(ROOT)
 
 

diff --git a/benchmarks/auth/Dockerfile → benchmarks/auth/docker/Dockerfile b/benchmarks/auth/Dockerfile → benchmarks/auth/docker/Dockerfile
@@ -51,8 +51,8 @@ WORKDIR /app/app/
 RUN apt-get install git ca-certificates
 
 COPY ./utils/tracing/go ../../utils/tracing/go
-COPY ./benchmarks/auth/go.mod ./
-COPY ./benchmarks/auth/go.sum ./
+COPY ./benchmarks/auth/go/go.mod ./
+COPY ./benchmarks/auth/go/go.sum ./
 COPY ./benchmarks/auth/go/server.go ./
 
 RUN go mod tidy

diff --git a/benchmarks/auth/go.mod → benchmarks/auth/go/go.mod b/benchmarks/auth/go.mod → benchmarks/auth/go/go.mod
diff --git a/benchmarks/auth/go.sum → benchmarks/auth/go/go.sum b/benchmarks/auth/go.sum → benchmarks/auth/go/go.sum
diff --git a/runner/aws_lambda_scripts/aws_actions.py b/runner/aws_lambda_scripts/aws_actions.py
@@ -111,6 +111,7 @@ def attach_policies_to_role(role, policies):
 
     basicRoleArn = 'arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
     client.attach_role_policy(RoleName=role, PolicyArn=basicRoleArn)
+    time.sleep(5)
 
 def publish_function(role, repo, tag, lambdafn, env):
     client = boto3.client('lambda')