✨ : add GOOGLE_PROJECT to google credentials

gaia-app · Aug 18, 2020 · cc16b32 · cc16b32
1 parent 36fa29b
commit cc16b32
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/main/client/app/pages/credentials/providers/credentials-google.vue b/src/main/client/app/pages/credentials/providers/credentials-google.vue
@@ -11,10 +11,21 @@
         <b-form-textarea
           v-model="credentials.serviceAccountJSONContents"
           :state="notEmpty(credentials.serviceAccountJSONContents)"
+          rows="10"
         />
       </b-input-group>
       <b-form-invalid-feedback>This field is mandatory</b-form-invalid-feedback>
     </b-form-group>
+
+    <b-form-group
+      label="Project"
+      description="Your GCP Project id (GOOGLE_PROJECT)"
+    >
+      <b-input
+        id="credentials.projectId"
+        v-model="credentials.projectId"
+      />
+    </b-form-group>
   </div>
 </template>
 

diff --git a/src/main/java/io/gaia_app/credentials/Credentials.kt b/src/main/java/io/gaia_app/credentials/Credentials.kt
@@ -43,8 +43,8 @@ data class AWSCredentials(var accessKey:String, var secretKey:String):Credential
 }
 
 @Document
-data class GoogleCredentials(var serviceAccountJSONContents:String):Credentials("google") {
-    override fun toEnv() = listOf("GOOGLE_CREDENTIALS=$serviceAccountJSONContents")
+data class GoogleCredentials(var serviceAccountJSONContents:String, var projectId:String? = null):Credentials("google") {
+    override fun toEnv() = listOf("GOOGLE_CREDENTIALS=$serviceAccountJSONContents", "GOOGLE_PROJECT=$projectId")
 }
 
 @Document

diff --git a/src/test/java/io/gaia_app/credentials/CredentialsTest.kt b/src/test/java/io/gaia_app/credentials/CredentialsTest.kt
@@ -20,8 +20,8 @@ internal class CredentialsTest {
     }
 
     @Test
-    fun `toEnv() for GoogleCredentials should return GOOGLE_CREDENTIALS`() {
-        assertThat(GoogleCredentials("jsonContent").toEnv())
-            .containsExactly("GOOGLE_CREDENTIALS=jsonContent")
+    fun `toEnv() for GoogleCredentials should return GOOGLE_CREDENTIALS and GOOGLE_PROJECT`() {
+        assertThat(GoogleCredentials("jsonContent", "projectId").toEnv())
+            .containsExactly("GOOGLE_CREDENTIALS=jsonContent", "GOOGLE_PROJECT=projectId")
     }
 }