Skip to content

Commit

Permalink
Merge pull request #61 from lalalilo/refactor-new-version
Browse files Browse the repository at this point in the history 
Separate distincts workflows
  • Loading branch information
@GregdTd
GregdTd committed Jun 4, 2024
2 parents f378c76 + c6422a2 commit 9944f84
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 102 deletions.
79 changes: 37 additions & 42 deletions src/cloudfront/index.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe("cloudfront", () => {
const listDistributionMock = jest.spyOn(cloudfront, "listDistributions");
const listTagsForResourceMock = jest.spyOn(
cloudfront,
"listTagsForResource"
"listTagsForResource",
);
const waitForMock = jest.spyOn(cloudfront, "waitFor");

Expand All @@ -46,7 +46,7 @@ describe("cloudfront", () => {
},
],
},
})
}),
)
.mockReturnValueOnce(
awsResolve({
Expand All @@ -61,15 +61,15 @@ describe("cloudfront", () => {
},
],
},
})
}),
);

listTagsForResourceMock.mockReturnValue(
awsResolve({
Tags: {
Items: [identifyingTag],
},
})
}),
);

const distribution: any =
Expand All @@ -92,15 +92,15 @@ describe("cloudfront", () => {
},
],
},
})
}),
);

listTagsForResourceMock.mockReturnValue(
awsResolve({
Tags: {
Items: [identifyingTag],
},
})
}),
);
waitForMock.mockReturnValue(awsResolve());

Expand All @@ -126,15 +126,15 @@ describe("cloudfront", () => {
const invalidationParams: any = createInvalidationMock.mock.calls[0][0];
expect(invalidationParams.DistributionId).toEqual("some-distribution-id");
expect(invalidationParams.InvalidationBatch.Paths.Items[0]).toEqual(
"index.html"
"index.html",
);
});

it("should invalidate the specified paths", async () => {
createInvalidationMock.mockReturnValue(awsResolve({ Invalidation: {} }));
await invalidateCloudfrontCache(
"some-distribution-id",
"index.html, static/*"
"index.html, static/*",
);

expect(createInvalidationMock).toHaveBeenCalledTimes(1);
Expand All @@ -152,7 +152,7 @@ describe("cloudfront", () => {
await invalidateCloudfrontCache(
"some-distribution-id",
"index.html",
true
true,
);
expect(waitForMock).toHaveBeenCalledTimes(1);
expect(waitForMock.mock.calls[0][0]).toEqual("invalidationCompleted");
Expand All @@ -174,7 +174,7 @@ describe("cloudfront", () => {

await invalidateCloudfrontCacheWithRetry(
"some-distribution-id",
"index.html, static/*"
"index.html, static/*",
);

expect(createInvalidationMock).toHaveBeenCalledTimes(2);
Expand All @@ -194,7 +194,7 @@ describe("cloudfront", () => {
try {
await invalidateCloudfrontCacheWithRetry(
"some-distribution-id",
"index.html, static/*"
"index.html, static/*",
);
} catch (error) {
expect(error).toBeDefined();
Expand All @@ -218,29 +218,29 @@ describe("cloudfront", () => {
it("should create a distribution and wait for it to be available", async () => {
const distribution = { Id: "distribution-id" };
createDistributionMock.mockReturnValue(
awsResolve({ Distribution: distribution })
awsResolve({ Distribution: distribution }),
);
tagResourceMock.mockReturnValue(awsResolve());
waitForMock.mockReturnValue(awsResolve());
const result = await createCloudFrontDistribution(
"hello.lalilo.com",
"arn:certificate"
"arn:certificate",
);
expect(result).toBe(distribution);
expect(tagResourceMock).toHaveBeenCalledTimes(1);
expect(createDistributionMock).toHaveBeenCalledTimes(1);
const distributionParam: any = createDistributionMock.mock.calls[0][0];
const distributionConfig = distributionParam.DistributionConfig;
expect(distributionConfig.Origins.Items[0].DomainName).toEqual(
"hello.lalilo.com.s3-website.eu-west-3.amazonaws.com"
"hello.lalilo.com.s3-website.eu-west-3.amazonaws.com",
);
expect(
distributionConfig.DefaultCacheBehavior.ViewerProtocolPolicy
distributionConfig.DefaultCacheBehavior.ViewerProtocolPolicy,
).toEqual("redirect-to-https");
expect(distributionConfig.DefaultCacheBehavior.MinTTL).toEqual(0);
expect(distributionConfig.DefaultCacheBehavior.Compress).toEqual(true);
expect(distributionConfig.ViewerCertificate.ACMCertificateArn).toEqual(
"arn:certificate"
"arn:certificate",
);

expect(waitForMock).toHaveBeenCalledTimes(1);
Expand All @@ -253,7 +253,7 @@ describe("cloudfront", () => {
describe("setSimpleAuthBehavior", () => {
const getDistributionConfig = jest.spyOn(
cloudfront,
"getDistributionConfig"
"getDistributionConfig",
);
const updateDistribution = jest.spyOn(cloudfront, "updateDistribution");

Expand All @@ -273,7 +273,7 @@ describe("cloudfront", () => {
},
},
ETag: "",
})
}),
);
await setSimpleAuthBehavior("distribution-id", null);
expect(updateDistribution).not.toHaveBeenCalled();
Expand All @@ -290,14 +290,14 @@ describe("cloudfront", () => {
},
},
ETag: "",
})
}),
);
updateDistribution.mockReturnValueOnce(awsResolve());
await setSimpleAuthBehavior("distribution-id", null);
expect(updateDistribution).toHaveBeenCalledTimes(1);
expect(
(updateDistribution.mock.calls[0][0] as any).DistributionConfig
.DefaultCacheBehavior.LambdaFunctionAssociations.Items
.DefaultCacheBehavior.LambdaFunctionAssociations.Items,
).toEqual([]);
});

Expand All @@ -312,11 +312,11 @@ describe("cloudfront", () => {
},
},
ETag: "",
})
}),
);
await setSimpleAuthBehavior(
"distribution-id",
`some-arn:${lambdaPrefix}:1`
`some-arn:${lambdaPrefix}:1`,
);
expect(updateDistribution).not.toHaveBeenCalled();
});
Expand All @@ -332,14 +332,14 @@ describe("cloudfront", () => {
},
},
ETag: "",
})
}),
);
updateDistribution.mockReturnValueOnce(awsResolve());
await setSimpleAuthBehavior("distribution-id", "some-arn:1");
expect(updateDistribution).toHaveBeenCalledTimes(1);
expect(
(updateDistribution.mock.calls[0][0] as any).DistributionConfig
.DefaultCacheBehavior.LambdaFunctionAssociations.Items
.DefaultCacheBehavior.LambdaFunctionAssociations.Items,
).toEqual([
{
EventType: "viewer-request",
Expand Down Expand Up @@ -372,7 +372,7 @@ describe("cloudfront", () => {
describe("updateCloudFrontDistribution", () => {
const getDistributionConfigMock = jest.spyOn(
cloudfront,
"getDistributionConfig"
"getDistributionConfig",
);
const updateDistribution = jest.spyOn(cloudfront, "updateDistribution");

Expand All @@ -387,7 +387,7 @@ describe("cloudfront", () => {
},
{ shouldBlockBucketPublicAccess: false },
])(
"should not update the distribution if the right origin is already associated",
`should not update the distribution if the right origin is already associated %p`,
async ({ shouldBlockBucketPublicAccess }) => {
const domainName = "hello.lalilo.com";
const originId = shouldBlockBucketPublicAccess
Expand All @@ -403,22 +403,19 @@ describe("cloudfront", () => {
};

getDistributionConfigMock.mockReturnValue(
awsResolve({ DistributionConfig: distribution })
awsResolve({ DistributionConfig: distribution }),
);

await updateCloudFrontDistribution(
distribution.Id,
domainName,
await updateCloudFrontDistribution(distribution.Id, domainName, {
shouldBlockBucketPublicAccess,
null
);
oac: null,
});

expect(updateDistribution).not.toHaveBeenCalled();
}
},
);

it("should update the distribution with an OAC when shouldBlockBucketPublicAccess and oac is given", async () => {
const shouldBlockBucketPublicAccess = true;
const domainName = "hello.lalilo.com";
const originIdForPrivateBucket =
getS3DomainNameForBlockedBucket(domainName);
Expand All @@ -433,16 +430,14 @@ describe("cloudfront", () => {
};

getDistributionConfigMock.mockReturnValue(
awsResolve({ DistributionConfig: distribution })
awsResolve({ DistributionConfig: distribution }),
);

updateDistribution.mockReturnValueOnce(awsResolve());
await updateCloudFrontDistribution(
distribution.Id,
domainName,
shouldBlockBucketPublicAccess,
oac
);
await updateCloudFrontDistribution(distribution.Id, domainName, {
shouldBlockBucketPublicAccess: true,
oac,
});

expect(updateDistribution).toHaveBeenCalled();
expect(updateDistribution).toHaveBeenCalledWith(
Expand All @@ -464,7 +459,7 @@ describe("cloudfront", () => {
TargetOriginId: originIdForPrivateBucket,
}),
}),
})
}),
);
});
});
Expand Down
7 changes: 5 additions & 2 deletions src/cloudfront/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,12 @@ const updateLambdaFunctionAssociations = async (
export const updateCloudFrontDistribution = async (
distributionId: string,
domainName: string,
shouldBlockBucketPublicAccess: boolean,
oac: OAC | null,
options: {
shouldBlockBucketPublicAccess: boolean;
oac: OAC | null;
},
) => {
const { shouldBlockBucketPublicAccess, oac } = options;
try {
const { DistributionConfig, ETag } = await cloudfront
.getDistributionConfig({ Id: distributionId })
Expand Down
43 changes: 10 additions & 33 deletions src/cloudfront/origin-access.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import {
describe("upsertOriginAccessControl", () => {
const listOriginAccessControlsMock = jest.spyOn(
cloudfront,
"listOriginAccessControls"
"listOriginAccessControls",
);

const getOriginAccessControlMock = jest.spyOn(
cloudfront,
"getOriginAccessControl"
"getOriginAccessControl",
);
const createOriginAccessControlMock = jest.spyOn(
cloudfront,
"createOriginAccessControl"
"createOriginAccessControl",
);

beforeEach(() => {
Expand All @@ -26,9 +26,8 @@ describe("upsertOriginAccessControl", () => {
createOriginAccessControlMock.mockReset();
});

it("does not create OAC if already existing and required (shouldBlockBucketPublicAccess is true)", async () => {
it("does not create OAC if already existing", async () => {
const domainName = "my-domain";
const shouldBlockBucketPublicAccess = true;
const distributionId = "my-distribution-id";
const oacName = getOriginAccessControlName(domainName, distributionId);

Expand All @@ -42,52 +41,30 @@ describe("upsertOriginAccessControl", () => {
},
],
},
})
}),
);

getOriginAccessControlMock.mockReturnValue(
awsResolve({ OriginAccessControl: {}, ETag: "my-etag" })
awsResolve({ OriginAccessControl: {}, ETag: "my-etag" }),
);

await upsertOriginAccessControl(
domainName,
distributionId,
shouldBlockBucketPublicAccess
);

expect(createOriginAccessControlMock).not.toHaveBeenCalled();
});
await upsertOriginAccessControl(domainName, distributionId);

it("does not create OAC if not necessary (shouldBlockBucketPublicAccess is false)", async () => {
const domainName = "my-domain";
const shouldBlockBucketPublicAccess = false;

await upsertOriginAccessControl(
domainName,
"my-distribution-id",
shouldBlockBucketPublicAccess
);
expect(listOriginAccessControlsMock).not.toHaveBeenCalled();
expect(createOriginAccessControlMock).not.toHaveBeenCalled();
});

it("creates OAC if necessary and required (shouldBlockBucketPublicAccess is true)", async () => {
const domainName = "my-domain";
const distributionId = "my-distribution-id";
const shouldBlockBucketPublicAccess = true;
const oacName = getOriginAccessControlName(domainName, distributionId);

listOriginAccessControlsMock.mockReturnValue(
awsResolve({
OriginAccessControlList: {},
})
}),
);
createOriginAccessControlMock.mockReturnValue(awsResolve({}));
await upsertOriginAccessControl(
domainName,
distributionId,
shouldBlockBucketPublicAccess
);
await upsertOriginAccessControl(domainName, distributionId);

expect(listOriginAccessControlsMock).toHaveBeenCalled();
expect(createOriginAccessControlMock).toHaveBeenCalledTimes(1);
Expand All @@ -100,7 +77,7 @@ describe("upsertOriginAccessControl", () => {
SigningProtocol: "sigv4",
Description: `OAC used by ${domainName} associated to distributionId: ${distributionId}`,
},
})
}),
);
});
});
Loading

0 comments on commit 9944f84

Please sign in to comment.