Skip to content

chore: upgrade cloudfront js runtime #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
byF merged 1 commit into from
Jul 7, 2026
Merged

chore: upgrade cloudfront js runtime #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 35 additions & 0 deletions internal/pkg/deploy/cloudformation/stack/static_site_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,41 @@ func TestStaticSite_Template(t *testing.T) {
// THEN
require.EqualError(t, err, "some error")
})

t.Run("renders CloudFront Function with runtime 2.0", func(t *testing.T) {
// GIVEN
static, err := NewStaticSite(&StaticSiteConfig{
App: &config.Application{
Name: testAppName,
},
EnvManifest: &manifest.Environment{
Workload: manifest.Workload{
Name: aws.String(testEnvName),
},
},
Manifest: &manifest.StaticSite{
Workload: manifest.Workload{
Name: aws.String("frontend"),
},
},
ArtifactBucketName: "mockBucket",
RuntimeConfig: RuntimeConfig{
Region: "us-west-2",
},
Addons: mockAddons{},
})
require.NoError(t, err)
static.parser = realEmbedFS

// WHEN
tpl, err := static.Template()

// THEN
require.NoError(t, err)
require.Contains(t, tpl, "Runtime: cloudfront-js-2.0")
require.NotContains(t, tpl, "Runtime: cloudfront-js-1.0")
require.Contains(t, tpl, "function handler(event){var request=event.request;var uri=request.uri;if(uri.endsWith('/')){request.uri+='index.html'}else if(!uri.includes('.')){request.uri+='/index.html'}return request}")
})
}

func TestStaticSite_Parameters(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/deploy/cloudformation/stack/testdata/workloads/static-site-test.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Resources:
function handler(event){var request=event.request;var uri=request.uri;if(uri.endsWith('/')){request.uri+='index.html'}else if(!uri.includes('.')){request.uri+='/index.html'}return request}
FunctionConfig:
Comment: CloudFront Function to rewrite viewer request to index.html
Runtime: cloudfront-js-1.0
Runtime: cloudfront-js-2.0
Name: my-app-test-static

CloudFrontDistribution:
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/deploy/cloudformation/stack/testdata/workloads/static-site.stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Resources:
function handler(event){var request=event.request;var uri=request.uri;if(uri.endsWith('/')){request.uri+='index.html'}else if(!uri.includes('.')){request.uri+='/index.html'}return request}
FunctionConfig:
Comment: CloudFront Function to rewrite viewer request to index.html
Runtime: cloudfront-js-1.0
Runtime: cloudfront-js-2.0
Name: my-app-my-env-static

CloudFrontDistribution:
Expand Down
2 changes: 1 addition & 1 deletion internal/pkg/template/templates/workloads/services/static-site/cf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Resources:
function handler(event){var request=event.request;var uri=request.uri;if(uri.endsWith('/')){request.uri+='index.html'}else if(!uri.includes('.')){request.uri+='/index.html'}return request}
FunctionConfig:
Comment: CloudFront Function to rewrite viewer request to index.html
Runtime: cloudfront-js-1.0
Runtime: cloudfront-js-2.0
# Truncate the name to allow at most 64 characters.
Name: {{truncateWithHashPadding (printf "%s-%s-%s" .AppName .EnvName .WorkloadName) 58 6}}

Expand Down