Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/components/dockerRegistry/Docker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ const CollapsedList = ({
awsAccessKeyId = '',
awsSecretAccessKey = '',
awsRegion = '',
assumeRoleArn = '',
isDefault = false,
active = true,
username = '',
Expand Down Expand Up @@ -319,6 +320,7 @@ const CollapsedList = ({
awsAccessKeyId,
awsSecretAccessKey,
awsRegion,
assumeRoleArn,
isDefault,
active,
username,
Expand Down Expand Up @@ -353,6 +355,7 @@ const DockerForm = ({
awsAccessKeyId,
awsSecretAccessKey,
awsRegion,
assumeRoleArn,
isDefault,
active,
username,
Expand Down Expand Up @@ -431,6 +434,7 @@ const DockerForm = ({
value: id && !awsSecretAccessKey ? DEFAULT_SECRET_PLACEHOLDER : awsSecretAccessKey,
error: '',
},
assumeRoleArn: { value: assumeRoleArn, error: '' },
registryUrl: { value: registryUrl, error: '' },
username: { value: username, error: '' },
password: {
Expand Down Expand Up @@ -629,6 +633,7 @@ const DockerForm = ({
password: { value: selectedRegistry.password.defaultValue, error: '' },
awsAccessKeyId: { value: '', error: '' },
awsSecretAccessKey: { value: '', error: '' },
assumeRoleArn: { value: '', error: '' },
}))
}

Expand Down Expand Up @@ -788,6 +793,7 @@ const DockerForm = ({
awsAccessKeyId: customState.awsAccessKeyId.value?.trim(),
awsSecretAccessKey: parsePassword(customState.awsSecretAccessKey.value),
awsRegion,
assumeRoleArn: customState.assumeRoleArn.value?.trim(),
}
: {}),
...((selectedDockerRegistryType.value === RegistryType.ARTIFACT_REGISTRY &&
Expand Down Expand Up @@ -1619,6 +1625,16 @@ const DockerForm = ({
</div>
</>
)}
<div className="form__row">
<CustomInput
name="assumeRoleArn"
value={customState.assumeRoleArn.value}
error={customState.assumeRoleArn.error}
onChange={customHandleChange}
label="Assume Role ARN (cross-account)"
placeholder="arn:aws:iam::123456789012:role/cross-account-ecr-role"
/>
</div>
</>
)
}
Expand Down
1 change: 1 addition & 0 deletions src/config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ export interface RegistryPayloadType {
awsAccessKeyId?: string
awsSecretAccessKey?: string
awsRegion?: string
assumeRoleArn?: string
username?: string
password?: string
connection?: string
Expand Down
Loading