fix: ensure OriginRequestPolicy names are valid

Author: H0R5E

pulumi/resources.ts

@@ -308,7 +308,7 @@ export function buildCDN(
         cachePolicyId: disabledCachePolicy.apply((policy) => policy.id!),
         targetOriginId: 'httpOrigin',
       },
-      orderedCacheBehaviors: routes.map((x) => buildBehavior(x, staticHeaders)),
+      orderedCacheBehaviors: buildBehaviors(routes, staticHeaders),
       restrictions: {
         geoRestriction: {
           restrictionType: 'none',
@@ -368,9 +368,28 @@ export function buildCDN(
   return distribution
 }
 
-function buildBehavior(route: string, headers: string[]) {
+interface Behavior {
+  pathPattern: string
+  allowedMethods: string[]
+  cachedMethods: string[]
+  targetOriginId: string
+  originRequestPolicyId: pulumi.Output<string>
+  cachePolicyId: pulumi.Output<string>
+  viewerProtocolPolicy: string
+}
+
+function buildBehaviors(routes: string[], headers: string[]): Behavior[] {
+  const behaviors: Behavior[] = []
+  for (const [index, route] of routes.entries()) {
+    const behavior = buildBehavior(route, headers, index)
+    behaviors.push(behavior)
+  }
+  return behaviors
+}
+
+function buildBehavior(route: string, headers: string[], index: number): Behavior {
   const routeRequestPolicy = new aws.cloudfront.OriginRequestPolicy(
-    registerName(`RouteRequestPolicy (${route})`),
+    registerName(`RouteRequestPolicy${index}`),
     {
       cookiesConfig: {
         cookieBehavior: 'none',

tests/tests.utils.test.ts

@@ -0,0 +1,21 @@
+
+
+describe('tests/utils.ts', () => {
+    let utils: typeof import('./utils')
+  
+    beforeEach(async () => {
+      vi.resetModules()
+      utils = await import('./utils')
+    })
+    
+    it.each([
+        ['dsaGS-', false],
+        ['af2-431--fdwfef', false],
+        ['32546546*-fgdasg', false],
+        ['grae0-5344-gafgar', true]
+      ])('validName(%s)', async (test, expected) => {
+        const result = utils.validName(test)
+        expect(result).toBe(expected)
+    })
+
+})

tests/utils.ts

@@ -8,10 +8,19 @@ import { Mocks } from '@pulumi/pulumi/runtime'
 
 export class MyMocks implements Mocks {
   public resources: { [key: string]: Record<string, any> } = {}
+  private noNameTest: string[] = [
+    'aws:route53/record:Record',
+    'aws:s3/bucketObject:BucketObject'
+  ]
   newResource(args: pulumi.runtime.MockResourceArgs): {
     id: string | undefined
     state: Record<string, any>
   } {
+    console.log(args.type)
+    
+    if (!validName(args.name) && !this.noNameTest.includes(args.type)) {
+      throw Error(`'${args.name}' is not a valid value for the name field`)
+    }
     const id = `${args.name}-id`
     const outputs = {
       id: id,
@@ -51,6 +60,13 @@ export class MyMocks implements Mocks {
   }
 }
 
+export function validName(name: string): boolean {
+  console.log(name)
+  const regex_valid = new RegExp('^[A-Za-z0-9-]*(?<!-)$')
+  const regex_double = new RegExp('--')
+  return regex_valid.test(name) && !(regex_double.test(name))
+}
+
 // Convert a pulumi.Output to a promise of the same type.
 export function promiseOf<T>(output: pulumi.Output<T>): Promise<T> {
   return new Promise((resolve) => output.apply(resolve))