Skip to content

Commit

Permalink
fix: rename OIDCProvider -> OidcProvider
Browse files Browse the repository at this point in the history
  • Loading branch information
WarFox committed Jun 13, 2024
1 parent 147ba9b commit 2beca9d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as iam from 'aws-cdk-lib/aws-iam';
const app = new App();
const stack = new Stack(app, 'oidc-provider-native-integ-stack');

const provider = new iam.OIDCProvider(stack, 'Provider', {
const provider = new iam.OidcProvider(stack, 'Provider', {
oidcProviderName: 'MyProvider',
url: 'https://oidc.eks.us-east-1.amazonaws.com/id/test1',
clientIds: ['foo', 'bar'],
Expand All @@ -15,7 +15,7 @@ const provider = new iam.OIDCProvider(stack, 'Provider', {
],
});

const minimal = new iam.OIDCProvider(stack, 'Minimal', {
const minimal = new iam.OidcProvider(stack, 'Minimal', {
url: 'https://oidc.eks.us-east-1.amazonaws.com/id/test2',
thumbprints: ['aa00aa1122aa00aa1122aa00aa1122aa00aa1122'],
});
Expand Down
12 changes: 6 additions & 6 deletions packages/aws-cdk-lib/aws-iam/lib/oidc-provider-native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Arn, IResource, Resource, Token } from '../../core';
* Represents an IAM OpenID Connect provider.
*
*/
export interface IOIDCProvider extends IResource {
export interface IOidcProvider extends IResource {
/**
* The Amazon Resource Name (ARN) of the IAM OpenID Connect provider.
*
Expand All @@ -25,7 +25,7 @@ export interface IOIDCProvider extends IResource {
/**
* Initialization properties for `OIDCProvider`.
*/
export interface OIDCProviderProps {
export interface OidcProviderProps {
/**
* The name of the OIDC Provider.
*
Expand Down Expand Up @@ -101,7 +101,7 @@ export interface OIDCProviderProps {
*
* @resource AWS::IAM::OIDCProvider
*/
export class OIDCProvider extends Resource implements IOIDCProvider {
export class OidcProvider extends Resource implements IOidcProvider {
/**
* Imports an Open ID connect provider from an ARN.
* @param scope The definition scope
Expand All @@ -112,13 +112,13 @@ export class OIDCProvider extends Resource implements IOIDCProvider {
scope: Construct,
id: string,
oidcProviderArn: string,
): IOIDCProvider {
): IOidcProvider {
const resourceName = Arn.extractResourceName(
oidcProviderArn,
'oidc-provider',
);

class Import extends Resource implements IOIDCProvider {
class Import extends Resource implements IOidcProvider {
public readonly oidcProviderArn = oidcProviderArn;
public readonly oidcProviderIssuer = resourceName;
}
Expand Down Expand Up @@ -156,7 +156,7 @@ export class OIDCProvider extends Resource implements IOIDCProvider {
public constructor(
scope: Construct,
id: string,
props: OIDCProviderProps,
props: OidcProviderProps,
) {
super(scope, id, {
physicalName: props.oidcProviderName,
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-cdk-lib/aws-iam/lib/oidc-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export interface OpenIdConnectProviderProps {
* @see https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_oidc.html
*
* @resource AWS::CloudFormation::CustomResource
* @deprecated Use { @link OIDCProvider } instead.
* @deprecated Use { @link OidcProvider } instead.
*/
export class OpenIdConnectProvider extends Resource implements IOpenIdConnectProvider {
/**
Expand Down
14 changes: 7 additions & 7 deletions packages/aws-cdk-lib/aws-iam/test/oidc-provider-native.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import * as iam from '../lib';
const arnOfProvider =
'arn:aws:iam::1234567:oidc-provider/oidc.eks.us-east-1.amazonaws.com/id/someid';

describe('OIDCProvider resource', () => {
describe('OidcProvider resource', () => {
test('"OIDCProviderArn" resolves to the ref', () => {
// GIVEN
const stack = new Stack();

// WHEN
const provider = new iam.OIDCProvider(stack, 'MyProvider', {
const provider = new iam.OidcProvider(stack, 'MyProvider', {
url: 'https://openid-endpoint',
thumbprints: ['thumbprint'],
});
Expand All @@ -27,7 +27,7 @@ describe('OIDCProvider resource', () => {
const stack = new Stack();

// WHEN
const provider = iam.OIDCProvider.fromOidcProviderArn(
const provider = iam.OidcProvider.fromOidcProviderArn(
stack,
'MyProvider',
arnOfProvider,
Expand All @@ -44,7 +44,7 @@ describe('OIDCProvider resource', () => {
const stack = new Stack();

// WHEN
new iam.OIDCProvider(stack, 'MyProvider', {
new iam.OidcProvider(stack, 'MyProvider', {
url: 'https://my-url',
clientIds: ['client1', 'client2'],
thumbprints: ['thumb1'],
Expand All @@ -65,7 +65,7 @@ describe('OIDC issuer', () => {
const stack = new Stack();

// WHEN
const provider = new iam.OIDCProvider(stack, 'MyProvider', {
const provider = new iam.OidcProvider(stack, 'MyProvider', {
url: 'https://my-issuer',
thumbprints: ['thumb1'],
});
Expand All @@ -84,7 +84,7 @@ describe('OIDC issuer', () => {
const stack = new Stack();

// WHEN
const provider = iam.OIDCProvider.fromOidcProviderArn(
const provider = iam.OidcProvider.fromOidcProviderArn(
stack,
'MyProvider',
arnOfProvider,
Expand All @@ -101,7 +101,7 @@ describe('OIDC issuer', () => {
const stack = new Stack();

// WHEN
const provider = iam.OIDCProvider.fromOidcProviderArn(
const provider = iam.OidcProvider.fromOidcProviderArn(
stack,
'MyProvider',
Token.asString({ Ref: 'ARN' }),
Expand Down

0 comments on commit 2beca9d

Please sign in to comment.