Skip to content
This repository was archived by the owner on Feb 13, 2020. It is now read-only.

Commit 018056a

Browse files
committed
use secret while creating resources
1 parent 916e8ed commit 018056a

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

frontend/packages/dev-console/src/components/import/git/CreateSourceSecretModal.tsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ import {
44
SourceSecretForm,
55
SecretTypeAbstraction,
66
} from '@console/internal/components/secrets/create-secret';
7-
import { createModalLauncher } from '@console/internal/components/factory/modal';
7+
import {
8+
createModalLauncher,
9+
ModalComponentProps,
10+
} from '@console/internal/components/factory/modal';
811

9-
interface CreateSourceSecretModalProps {
10-
cancel: (e: MouseEvent) => void;
11-
close: () => void;
12-
onSave?: (name: string) => void;
12+
export interface CreateSourceSecretModalProps {
13+
save?: (name: string) => void;
1314
namespace: string;
1415
}
1516

16-
const CreateSourceSecretModal: React.FC<CreateSourceSecretModalProps> = ({
17-
close,
18-
namespace,
19-
onSave,
20-
}) => {
21-
const CreateSourceSecretForm = withSecretForm(SourceSecretForm, true);
17+
type Props = CreateSourceSecretModalProps & ModalComponentProps;
18+
19+
const CreateSourceSecretForm = withSecretForm(SourceSecretForm, true);
20+
21+
const CreateSourceSecretModal: React.FC<Props> = ({ close, namespace, save }) => {
2222
const handleSave = (name: string) => {
2323
close();
24-
onSave(name);
24+
save(name);
2525
};
2626
return (
2727
<CreateSourceSecretForm
@@ -36,6 +36,6 @@ const CreateSourceSecretModal: React.FC<CreateSourceSecretModalProps> = ({
3636
);
3737
};
3838

39-
export const sourceSecretModalLauncher = createModalLauncher<CreateSourceSecretModalProps>(
40-
CreateSourceSecretModal,
41-
);
39+
export const sourceSecretModalLauncher = createModalLauncher<Props>(CreateSourceSecretModal);
40+
41+
export default CreateSourceSecretModal;

frontend/packages/dev-console/src/components/import/git/SourceSecretSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { sourceSecretModalLauncher } from './CreateSourceSecretModal';
66

77
const CREATE_SOURCE_SECRET = 'create-source-secret';
88

9-
interface SourceSecretSelectorProps {
9+
export interface SourceSecretSelectorProps {
1010
namespace: string;
1111
helpText: string;
1212
}
@@ -22,7 +22,7 @@ const SourceSecretSelector: React.FC<SourceSecretSelectorProps> = ({ namespace,
2222
const handleDropdownChange = (key: string) => {
2323
if (key === CREATE_SOURCE_SECRET) {
2424
setFieldValue('git.secret', secret.value);
25-
sourceSecretModalLauncher({ namespace, onSave: handleSave });
25+
sourceSecretModalLauncher({ namespace, save: handleSave });
2626
} else {
2727
setFieldValue('git.secret', key);
2828
}

frontend/packages/dev-console/src/components/import/import-submit-utils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const createBuildConfig = (
4747
name,
4848
project: { name: namespace },
4949
application: { name: application },
50-
git: { url: repository, ref = 'master', dir: contextDir },
50+
git: { url: repository, ref = 'master', dir: contextDir, secret: secretName },
5151
image: { tag: selectedTag },
5252
build: { env, triggers },
5353
labels: userLabels,
@@ -76,6 +76,7 @@ export const createBuildConfig = (
7676
ref,
7777
type: 'Git',
7878
},
79+
...(secretName ? { sourceSecret: { name: secretName } } : {}),
7980
},
8081
strategy: {
8182
type: 'Source',

frontend/public/components/secrets/create-secret.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ const generateSecret = () => {
8888
};
8989

9090
// withSecretForm returns SubForm which is a Higher Order Component for all the types of secret forms.
91-
export const withSecretForm = (SubForm, modal?:boolean) => class SecretFormComponent extends React.Component<BaseEditSecretProps_, BaseEditSecretState_> {
91+
export const withSecretForm = (SubForm, modal?: boolean) => class SecretFormComponent extends React.Component<BaseEditSecretProps_, BaseEditSecretState_> {
9292
constructor(props) {
9393
super(props);
9494
const existingSecret = _.pick(props.obj, ['metadata', 'type']);
@@ -1044,7 +1044,7 @@ type BaseEditSecretProps_ = {
10441044
saveButtonText?: string;
10451045
explanation: string;
10461046
onCancel?: () => void;
1047-
onSave?:(name: string) => void;
1047+
onSave?: (name: string) => void;
10481048
};
10491049

10501050
type BasicAuthSubformProps = {

0 commit comments

Comments
 (0)