Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 2 deletions

diff --git a/app/assets/javascripts/ci/runner/group_new_runner/group_new_runner_app.vue b/app/assets/javascripts/ci/runner/group_new_runner/group_new_runner_app.vue
index c907f9c8982..21058c93d15 100644
--- a/app/assets/javascripts/ci/runner/group_new_runner/group_new_runner_app.vue
+++ b/app/assets/javascripts/ci/runner/group_new_runner/group_new_runner_app.vue
@@ -2,11 +2,17 @@
 import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { visitUrl, setUrlParams } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
-
+import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import RegistrationCompatibilityAlert from '~/ci/runner/components/registration/registration_compatibility_alert.vue';
 import RunnerPlatformsRadioGroup from '~/ci/runner/components/runner_platforms_radio_group.vue';
+import RunnerCloudConnectionForm from '~/ci/runner/components/runner_cloud_connection_form.vue';
 import RunnerCreateForm from '~/ci/runner/components/runner_create_form.vue';
-import { DEFAULT_PLATFORM, GROUP_TYPE, PARAM_KEY_PLATFORM } from '../constants';
+import {
+  DEFAULT_PLATFORM,
+  GOOGLE_CLOUD_PLATFORM,
+  GROUP_TYPE,
+  PARAM_KEY_PLATFORM,
+} from '../constants';
 import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage';
 
 export default {
@@ -14,8 +20,10 @@ export default {
   components: {
     RegistrationCompatibilityAlert,
     RunnerPlatformsRadioGroup,
+    RunnerCloudConnectionForm,
     RunnerCreateForm,
   },
+  mixins: [glFeatureFlagsMixin()],
   props: {
     groupId: {
       type: String,
@@ -27,6 +35,14 @@ export default {
       platform: DEFAULT_PLATFORM,
     };
   },
+  computed: {
+    gcpEnabled() {
+      return this.glFeatures.gcpRunner;
+    },
+    showCloudForm() {
+      return this.platform === GOOGLE_CLOUD_PLATFORM && this.gcpEnabled;
+    },
+  },
   methods: {
     onSaved(runner) {
       const params = { [PARAM_KEY_PLATFORM]: this.platform };
@@ -65,11 +81,15 @@ export default {
     <h2 class="gl-font-size-h2 gl-my-5">
       {{ s__('Runners|Platform') }}
     </h2>
+
     <runner-platforms-radio-group v-model="platform" />
 
     <hr aria-hidden="true" />
 
+    <runner-cloud-connection-form v-if="showCloudForm" />
+
     <runner-create-form
+      v-else
       :runner-type="$options.GROUP_TYPE"
       :group-id="groupId"
       @saved="onSaved"