use secret while creating resources

talamer · Jul 3, 2019 · 27b7d51 · 27b7d51
1 parent 916e8ed
commit 27b7d51
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/frontend/packages/dev-console/src/components/import/git/CreateSourceSecretModal.tsx b/frontend/packages/dev-console/src/components/import/git/CreateSourceSecretModal.tsx
@@ -6,19 +6,20 @@ import {
 } from '@console/internal/components/secrets/create-secret';
 import { createModalLauncher } from '@console/internal/components/factory/modal';
 
-interface CreateSourceSecretModalProps {
+export interface CreateSourceSecretModalProps {
   cancel: (e: MouseEvent) => void;
   close: () => void;
   onSave?: (name: string) => void;
   namespace: string;
 }
 
+const CreateSourceSecretForm = withSecretForm(SourceSecretForm, true);
+
 const CreateSourceSecretModal: React.FC<CreateSourceSecretModalProps> = ({
   close,
   namespace,
   onSave,
 }) => {
-  const CreateSourceSecretForm = withSecretForm(SourceSecretForm, true);
   const handleSave = (name: string) => {
     close();
     onSave(name);
@@ -39,3 +40,5 @@ const CreateSourceSecretModal: React.FC<CreateSourceSecretModalProps> = ({
 export const sourceSecretModalLauncher = createModalLauncher<CreateSourceSecretModalProps>(
   CreateSourceSecretModal,
 );
+
+export default CreateSourceSecretModal;
diff --git a/frontend/packages/dev-console/src/components/import/git/SourceSecretSelector.tsx b/frontend/packages/dev-console/src/components/import/git/SourceSecretSelector.tsx
@@ -6,7 +6,7 @@ import { sourceSecretModalLauncher } from './CreateSourceSecretModal';
 
 const CREATE_SOURCE_SECRET = 'create-source-secret';
 
-interface SourceSecretSelectorProps {
+export interface SourceSecretSelectorProps {
   namespace: string;
   helpText: string;
 }

diff --git a/frontend/packages/dev-console/src/components/import/import-submit-utils.ts b/frontend/packages/dev-console/src/components/import/import-submit-utils.ts
@@ -47,7 +47,7 @@ export const createBuildConfig = (
     name,
     project: { name: namespace },
     application: { name: application },
-    git: { url: repository, ref = 'master', dir: contextDir },
+    git: { url: repository, ref = 'master', dir: contextDir, secret: secretName },
     image: { tag: selectedTag },
     build: { env, triggers },
     labels: userLabels,
@@ -95,6 +95,13 @@ export const createBuildConfig = (
     },
   };
 
+  if (secretName) {
+    const param = 'sourceSecret';
+    buildConfig.spec.source[param] = {
+      name: secretName,
+    };
+  }
+
   return k8sCreate(BuildConfigModel, buildConfig, dryRun ? dryRunOpt : {});
 };
 

diff --git a/frontend/public/components/secrets/create-secret.tsx b/frontend/public/components/secrets/create-secret.tsx
@@ -88,7 +88,7 @@ const generateSecret = () => {
 };
 
 // withSecretForm returns SubForm which is a Higher Order Component for all the types of secret forms.
-export const withSecretForm = (SubForm, modal?:boolean) => class SecretFormComponent extends React.Component<BaseEditSecretProps_, BaseEditSecretState_> {
+export const withSecretForm = (SubForm, modal?: boolean) => class SecretFormComponent extends React.Component<BaseEditSecretProps_, BaseEditSecretState_> {
   constructor(props) {
     super(props);
     const existingSecret = _.pick(props.obj, ['metadata', 'type']);
@@ -1044,7 +1044,7 @@ type BaseEditSecretProps_ = {
   saveButtonText?: string;
   explanation: string;
   onCancel?: () => void;
-  onSave?:(name: string) => void;
+  onSave?: (name: string) => void;
 };
 
 type BasicAuthSubformProps = {