From 900e7f8f5d0cfcf6c416ea42884cc6dcc1ea3f17 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 08:52:17 -0800 Subject: [PATCH 1/7] router extension config --- .../types/v1/routers/HttpRouterConfig.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index 75f87504..417455dc 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -14,6 +14,8 @@ properties: required: - redirect - forward + - proxy + - caching properties: redirect: nullable: true @@ -50,3 +52,35 @@ properties: scheme: nullable: true type: string + proxy: + nullable: true + type: object + required: + - domain + properties: + domain: + nullable: true + type: string + description: The proxy domain for this router. + caching: + nullable: true + type: object + required: + - files + properties: + files: + nullable: true + type: array + items: + type: object + required: + - match + - ttl + properties: + match: + describe: Regex string that describes the files types to cache. + example: (.*)\\.(js|jpg|css|png|svg)$ + type: string + ttl: + description: Time string describing the time to live. + $ref: ../../../../../../../Duration.yml From 35e2d75f6c6a9aeb8890ca71d3c908558101cd7b Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 08:54:14 -0800 Subject: [PATCH 2/7] spelling --- .../loadbalancer/types/v1/routers/HttpRouterConfig.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index 417455dc..b7e6e618 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -78,9 +78,9 @@ properties: - ttl properties: match: - describe: Regex string that describes the files types to cache. + description: Regex string that describes the files to cache. example: (.*)\\.(js|jpg|css|png|svg)$ type: string ttl: - description: Time string describing the time to live. + description: Time string that describes the time to live. $ref: ../../../../../../../Duration.yml From b87ab09278bdb203ac7708557f3a000bbb54979f Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 09:42:30 -0800 Subject: [PATCH 3/7] remove www --- .../loadbalancer/types/v1/routers/HttpRouterConfig.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index b7e6e618..0e4aa44f 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -22,15 +22,18 @@ properties: type: object required: - auto_https_redirect + - remove_www - port - scheme - url description: Defines a built-in redirect for HTTP mode routers properties: auto_https_redirect: - nullable: true type: boolean description: If enabled and a sibling controller exists for port 443, requests will be auto redirected to it. Essentially sets up automatic TLS redirection for this router. + remove_www: + description: If true, any request comes in with "www" prefix will be permanently redirected to the same path without www. + type: boolean port: nullable: true type: integer From 37a5a01e7650731bce1f5e6ba0ec329eca285056 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 10:57:11 -0800 Subject: [PATCH 4/7] iff nullable, optional --- .../loadbalancer/types/v1/routers/HttpRouterConfig.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index 0e4aa44f..e0a423b9 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -11,11 +11,6 @@ properties: - http details: type: object - required: - - redirect - - forward - - proxy - - caching properties: redirect: nullable: true From 2fc63bb0afe18a9f25dd91d9442a563a618bc39d Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 10:59:33 -0800 Subject: [PATCH 5/7] missing --- .../loadbalancer/types/v1/routers/HttpRouterConfig.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index e0a423b9..5304c3cd 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -18,9 +18,6 @@ properties: required: - auto_https_redirect - remove_www - - port - - scheme - - url description: Defines a built-in redirect for HTTP mode routers properties: auto_https_redirect: From 60c28ee393f97bf3720597b3c5963f31eeba01c9 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 11:04:11 -0800 Subject: [PATCH 6/7] files optional --- .../services/loadbalancer/types/v1/routers/HttpRouterConfig.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index 5304c3cd..770ef5d3 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -60,8 +60,6 @@ properties: caching: nullable: true type: object - required: - - files properties: files: nullable: true From 32c006b477b51a86a10b0e75511870d7e4fdd153 Mon Sep 17 00:00:00 2001 From: blewisCycle Date: Tue, 12 Dec 2023 11:05:48 -0800 Subject: [PATCH 7/7] all nullable optional --- .../loadbalancer/types/v1/routers/HttpRouterConfig.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml index 770ef5d3..d771fdd7 100644 --- a/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml +++ b/components/schemas/stacks/spec/services/loadbalancer/types/v1/routers/HttpRouterConfig.yml @@ -41,8 +41,6 @@ properties: forward: nullable: true type: object - required: - - scheme properties: scheme: nullable: true @@ -50,8 +48,6 @@ properties: proxy: nullable: true type: object - required: - - domain properties: domain: nullable: true