From 2a22ff72acae179b21c8b76eb0a18fe9083a1fe6 Mon Sep 17 00:00:00 2001
From: "Yauheni Rykhter (EPAM)" <yauheni_rykhter@epam.com>
Date: Tue, 21 Feb 2023 10:08:42 +0000
Subject: [PATCH] GONRG-6557: update gc values
---
app/bundles/providers/{gcp => gc}/__init__.py | 2 +-
app/bundles/providers/{gcp => gc}/storage.py | 2 +-
devops/gc/deploy/templates/policy-configmap.yaml | 2 +-
devops/gc/pipeline/override-stages.yml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
rename app/bundles/providers/{gcp => gc}/__init__.py (88%)
rename app/bundles/providers/{gcp => gc}/storage.py (97%)
diff --git a/app/bundles/providers/gcp/__init__.py b/app/bundles/providers/gc/__init__.py
similarity index 88%
rename from app/bundles/providers/gcp/__init__.py
rename to app/bundles/providers/gc/__init__.py
index 545d0429..6a5313e4 100644
--- a/app/bundles/providers/gcp/__init__.py
+++ b/app/bundles/providers/gc/__init__.py
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from bundles.providers.gcp.storage import GCPBundleStorageClient as storage_client
\ No newline at end of file
+from bundles.providers.gc.storage import GCBundleStorageClient as storage_client
\ No newline at end of file
diff --git a/app/bundles/providers/gcp/storage.py b/app/bundles/providers/gc/storage.py
similarity index 97%
rename from app/bundles/providers/gcp/storage.py
rename to app/bundles/providers/gc/storage.py
index be7163aa..333673e4 100644
--- a/app/bundles/providers/gcp/storage.py
+++ b/app/bundles/providers/gc/storage.py
@@ -23,7 +23,7 @@ from bundles.storage import BundleStorageClient
logger = logging.getLogger(__name__)
-class GCPBundleStorageClient(BundleStorageClient):
+class GCBundleStorageClient(BundleStorageClient):
def __init__(self) -> None:
self.client = get_client()
self.bucket_name = os.environ["POLICY_BUCKET"]
diff --git a/devops/gc/deploy/templates/policy-configmap.yaml b/devops/gc/deploy/templates/policy-configmap.yaml
index c25fc197..405abd48 100644
--- a/devops/gc/deploy/templates/policy-configmap.yaml
+++ b/devops/gc/deploy/templates/policy-configmap.yaml
@@ -14,7 +14,7 @@ data:
POLICY_BUCKET: "{{ .Values.data.bucketName }}"
USE_BUNDLES: "{{ .Values.data.useBundles }}"
{{- if not .Values.conf.onPremEnabled }}
- CLOUD_PROVIDER: "gcp"
+ CLOUD_PROVIDER: "gc"
{{- else }}
CLOUD_PROVIDER: "anthos"
MINIO_ENDPOINT: "{{ .Values.data.minioHost }}"
diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index 441892d8..a0e3104d 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -16,7 +16,7 @@ gc-test-python:
image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
variables:
POLICY_BUCKET: $GC_POLICY_BUCKET
- CLOUD_PROVIDER: gcp
+ CLOUD_PROVIDER: gc
OPA_URL: $GC_OPA_URL
ENTITLEMENTS_BASE_URL: $HOST
LEGAL_BASE_URL: $HOST
@@ -26,7 +26,7 @@ gc-dev2-test-python:
image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
variables:
POLICY_BUCKET: $GC_POLICY_BUCKET
- CLOUD_PROVIDER: gcp
+ CLOUD_PROVIDER: gc
OPA_URL: $GC_OPA_URL
ENTITLEMENTS_BASE_URL: $HOST
LEGAL_BASE_URL: $HOST
--
GitLab