switch to input json path

Author: oleksandr-r-q

package/cloudshell/iac/terraform/services/clp_envvar_handler.py

@@ -67,8 +67,6 @@ def set_env_vars_based_on_clp(self):
                 os.environ["ARM_CLIENT_SECRET"] = self._shell_helper.api.DecryptPassword(attr.Value).Value
 
 
-
-
 class GCPCloudProviderEnvVarHandler(BaseCloudProviderEnvVarHandler):
     def __init__(self, clp_res_model, clp_resource_attributes, shell_helper):
         BaseCloudProviderEnvVarHandler.__init__(self)
@@ -81,7 +79,7 @@ def set_env_vars_based_on_clp(self):
             if self.does_attribute_match(self._clp_res_model, attr, self._shell_helper, "CREDENTIALS JSON PATH"):
                 os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = attr.Value
             if self.does_attribute_match(self._clp_res_model, attr, self._shell_helper, "PROJECT"):
-                os.environ["project"] = attr.Value
+                os.environ["GOOGLE_PROJECT"] = attr.Value
                 project_flag = True
         if not project_flag:
             raise ValueError("Project ID was not found on GCP Cloud Provider")        

shells/backends/gcp_tf_backend/shell-definition.yaml

@@ -17,30 +17,14 @@ node_types:
   vendor.resource.Gcp Tf Backend:
     derived_from: cloudshell.nodes.GenericResource
     properties:
-      Private Key:
-        description: Private key (Use only if Cloud Provider not specified)
-        type: cloudshell.datatypes.Password
-        tags: [ setting, user_input ]
-      # Private Key:
-      #   description: Private key (Use only if Cloud Provider not specified)
-      #   type: string
-      #   tags: [ setting, user_input ]        
-      # Client Email:
-      #   description: Client Email (Use only if Cloud Provider not specified)
-      #   type: cloudshell.datatypes.Password
-      #   tags: [ setting, user_input ]
-      Client Email:
-        description: Client Email (Use only if Cloud Provider not specified)
+      Credentials Json Path:
+        description: Credentials Json Path (Use only if Cloud Provider not specified)
         type: string
         tags: [ setting, user_input ]      
       Bucket Name:
         description: The name of the bucket to be used in order to save the state file
         type: string
         tags: [ setting, user_input ]
-      Prefix:
-        description: GCS prefix inside the bucket. Named states for workspaces are stored in an object called <prefix>/<name>.tfstate (Optional)
-        type: string
-        tags: [ setting, user_input ]
       Cloud Provider:
         description: In case Private Key and Client Email were not filled - the keys from the cloud provider will be used.
         type: string
@@ -72,18 +56,12 @@ node_types:
             default: Describe the resource shell template
           Bucket Name:
             description: The name of the bucket to be used in order to save the state file
-            type: string
-          Prefix:
-            description: GCS prefix inside the bucket. Named states for workspaces are stored in an object called <prefix>/<name>.tfstate (Optional)
-            type: string           
+            type: string       
           # Private Key:
           #   description: Private key
           #   type: string
-          Private Key:
-            description: Private key
-            type: cloudshell.datatypes.Password
-          Client Email:
-            description: Client Email
+          Credentials Json Path:
+            description: Credentials Json Path
             type: string
           Project:
             type: string

shells/backends/gcp_tf_backend/src/data_model.py

@@ -155,34 +155,19 @@ def cloudshell_model_name(self):
         return 'GcpTfBackend'
 
     @property
-    def private_key(self):
-        """
-        :rtype: string
-        """
-        return self.attributes['Gcp Tf Backend.Private Key'] if 'Gcp Tf Backend.Private Key' in self.attributes else None
-
-    @private_key.setter
-    def private_key(self, value):
-        """
-        Private key (Use only if Cloud Provider not specified)
-        :type value: string
-        """
-        self.attributes['Gcp Tf Backend.Private Key'] = value
-
-    @property
-    def client_email(self):
+    def credentials_json_path(self):
         """
         :rtype: str
         """
-        return self.attributes['Gcp Tf Backend.Client Email'] if 'Gcp Tf Backend.Client Email' in self.attributes else None
+        return self.attributes['Gcp Tf Backend.Credentials Json Path'] if 'Gcp Tf Backend.Credentials Json Path' in self.attributes else None
 
-    @client_email.setter
-    def client_email(self, value):
+    @credentials_json_path.setter
+    def credentials_json_path(self, value):
         """
-        Client Email (Use only if Cloud Provider not specified)
+        Credentials Json Path (Use only if Cloud Provider not specified)
         :type value: str
         """
-        self.attributes['Gcp Tf Backend.Client Email'] = value
+        self.attributes['Gcp Tf Backend.Credentials Json Path'] = value
 
     @property
     def bucket_name(self):
@@ -199,21 +184,6 @@ def bucket_name(self, value):
         """
         self.attributes['Gcp Tf Backend.Bucket Name'] = value
 
-    @property
-    def prefix(self):
-        """
-        :rtype: str
-        """
-        return self.attributes['Gcp Tf Backend.Prefix'] if 'Gcp Tf Backend.Prefix' in self.attributes else None
-
-    @prefix.setter
-    def prefix(self, value):
-        """
-        GCS prefix inside the bucket. Named states for workspaces are stored in an object called <prefix>/<name>.tfstate (Optional)
-        :type value: str
-        """
-        self.attributes['Gcp Tf Backend.Prefix'] = value
-
     @property
     def cloud_provider(self):
         """