Skip to content
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.

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

Adding reserved names #564

Merged
merged 15 commits into from
May 23, 2022
Merged

Adding reserved names #564

merged 15 commits into from
May 23, 2022

Conversation

ryan-cahill
Copy link
Member

No description provided.

@ryan-cahill ryan-cahill changed the title Adding reserved names [WIP] Adding reserved names Apr 26, 2022
@tjhiggins
Copy link
Member

Talked with Ryan and we are going to get this ready for release without supporting interpolation for the reserved name field.

@ryan-cahill ryan-cahill changed the title [WIP] Adding reserved names Adding reserved names May 20, 2022
@@ -44,7 +44,7 @@ export default abstract class DependencyManager {
// Load component tasks
for (const [task_name, task_config] of Object.entries(component.tasks)) {
const node = new TaskNode({
ref: buildNodeRef(component, 'tasks', task_name),
ref: task_config.reserved_name || buildNodeRef(component, 'tasks', task_name),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't we move this logic into buildNodeRef?

something like:
component_config[resource_type][resource_name].reserved_name

@@ -34,6 +34,10 @@ export class Slugs {
public static ComponentSecretDescription = 'must contain alphanumeric character ([a-z0-9A-Z]), could contain dashes (-), underscores (_), and alphanumerics between.';
public static ComponentSecretRegexBase = `[a-zA-Z0-9_-]+`;
public static ComponentSecretValidator = new RegExp(`^${Slugs.ComponentSecretRegexBase}$`);

public static ReservedNameDescription = `must contain only alphanumeric characters ([a-z0-9A-Z]), could contain dashes (-), underscores (_), and alphanumerics between; max length ${Slugs.SLUG_CHAR_LIMIT}`;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think underscores are allowed for k8s resource names. Hadn't considered this case though...

I also don't want to allow bypassing the regex enforcement for service names from ArchitectSlugValidator.

@tjhiggins tjhiggins merged commit 0058d3d into rc May 23, 2022
@tjhiggins tjhiggins deleted the reserved-names branch May 23, 2022 16:06
github-actions bot pushed a commit that referenced this pull request May 23, 2022
# [1.16.0-rc.9](v1.16.0-rc.8...v1.16.0-rc.9) (2022-05-23)

### Features

* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
github-actions bot pushed a commit that referenced this pull request Jun 14, 2022
# [1.16.0-arc-tenant-test.1](v1.15.2...v1.16.0-arc-tenant-test.1) (2022-06-14)

### Bug Fixes

* **dev:** Do not throw errors on health check. ([#570](#570)) ([9949062](9949062))
* **dev:** gracefully handle error from docker restart ([68ddceb](68ddceb))
* **docs:** Fixed schema generation for ci ([#568](#568)) ([a809a7c](a809a7c))
* **examples:** Hello world dockerfile ([#561](#561)) ([9173ef9](9173ef9))
* **interpolation:** Whitelist interpolation ([#577](#577)) ([792de39](792de39))
* **register:** Improved support for M1 builds. ([7f6b672](7f6b672))
* **register:** Reverted buildx changes as we investigate issues with CI providers. ([a0b17d4](a0b17d4))
* **register:** Switch to buildx for building containers ([539e189](539e189))
* **test:** update tests with traefik version ([18efc82](18efc82))

### Features

* **reserved names:** Adding architect_ref for image name generation and tagging ([d5e4c51](d5e4c51))
* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
* **secrets:** Params to secrets ([#551](#551)) ([aa16b4e](aa16b4e)), closes [#556](#556)
github-actions bot pushed a commit that referenced this pull request Jun 14, 2022
# [1.16.0-arc-tenant-test.1](v1.15.2...v1.16.0-arc-tenant-test.1) (2022-06-14)

### Bug Fixes

* **dev:** Do not throw errors on health check. ([#570](#570)) ([9949062](9949062))
* **dev:** gracefully handle error from docker restart ([68ddceb](68ddceb))
* **docs:** Fixed schema generation for ci ([#568](#568)) ([a809a7c](a809a7c))
* **examples:** Hello world dockerfile ([#561](#561)) ([9173ef9](9173ef9))
* **interpolation:** Whitelist interpolation ([#577](#577)) ([792de39](792de39))
* **register:** Improved support for M1 builds. ([7f6b672](7f6b672))
* **register:** Reverted buildx changes as we investigate issues with CI providers. ([a0b17d4](a0b17d4))
* **register:** Switch to buildx for building containers ([539e189](539e189))
* **test:** update tests with traefik version ([18efc82](18efc82))

### Features

* **reserved names:** Adding architect_ref for image name generation and tagging ([d5e4c51](d5e4c51))
* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
* **secrets:** Params to secrets ([#551](#551)) ([aa16b4e](aa16b4e)), closes [#556](#556)
github-actions bot pushed a commit that referenced this pull request Jun 14, 2022
# [1.16.0-arc-tenant-test-2.1](v1.15.2...v1.16.0-arc-tenant-test-2.1) (2022-06-14)

### Bug Fixes

* **dev:** Do not throw errors on health check. ([#570](#570)) ([9949062](9949062))
* **dev:** gracefully handle error from docker restart ([68ddceb](68ddceb))
* **docs:** Fixed schema generation for ci ([#568](#568)) ([a809a7c](a809a7c))
* **examples:** Hello world dockerfile ([#561](#561)) ([9173ef9](9173ef9))
* **interpolation:** Whitelist interpolation ([#577](#577)) ([792de39](792de39))
* **register:** Improved support for M1 builds. ([7f6b672](7f6b672))
* **register:** Reverted buildx changes as we investigate issues with CI providers. ([a0b17d4](a0b17d4))
* **register:** Switch to buildx for building containers ([539e189](539e189))
* **test:** update tests with traefik version ([18efc82](18efc82))

### Features

* **reserved names:** Adding architect_ref for image name generation and tagging ([d5e4c51](d5e4c51))
* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
* **secrets:** Params to secrets ([#551](#551)) ([aa16b4e](aa16b4e)), closes [#556](#556)
github-actions bot pushed a commit that referenced this pull request Jun 22, 2022
# [1.16.0-arc-skypack.1](v1.15.2...v1.16.0-arc-skypack.1) (2022-06-22)

### Bug Fixes

* **dev:** Do not throw errors on health check. ([#570](#570)) ([9949062](9949062))
* **dev:** gracefully handle error from docker restart ([68ddceb](68ddceb))
* **docs:** Fixed schema generation for ci ([#568](#568)) ([a809a7c](a809a7c))
* **examples:** Hello world dockerfile ([#561](#561)) ([9173ef9](9173ef9))
* **interpolation:** Whitelist interpolation ([#577](#577)) ([792de39](792de39))
* **ref:** Behind the scenes support for better name handling ([d96008f](d96008f))
* **register:** Improved support for M1 builds. ([7f6b672](7f6b672))
* **register:** Reverted buildx changes as we investigate issues with CI providers. ([a0b17d4](a0b17d4))
* **register:** Switch to buildx for building containers ([539e189](539e189))
* **test:** update tests with traefik version ([18efc82](18efc82))

### Features

* **reserved names:** Adding architect_ref for image name generation and tagging ([d5e4c51](d5e4c51))
* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
* **secrets:** Params to secrets ([#551](#551)) ([aa16b4e](aa16b4e)), closes [#556](#556)
github-actions bot pushed a commit that referenced this pull request Jun 23, 2022
# [1.17.0-rc.1](v1.16.4...v1.17.0-rc.1) (2022-06-23)

### Bug Fixes

* **interpolation:** Whitelist interpolation ([#577](#577)) ([792de39](792de39))
* **ref:** Behind the scenes support for better name handling ([d96008f](d96008f))
* **register:** Switch to buildx for building containers ([539e189](539e189))

### Features

* **reserved names:** Adding architect_ref for image name generation and tagging ([d5e4c51](d5e4c51))
* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
github-actions bot pushed a commit that referenced this pull request Jun 23, 2022
# [1.17.0](v1.16.4...v1.17.0) (2022-06-23)

### Bug Fixes

* **interpolation:** Whitelist interpolation ([#577](#577)) ([792de39](792de39))
* **ref:** Behind the scenes support for better name handling ([d96008f](d96008f))
* **register:** Switch to buildx for building containers ([539e189](539e189))

### Features

* **reserved names:** Adding architect_ref for image name generation and tagging ([d5e4c51](d5e4c51))
* **reserved_name:** Adding reserved names ([#564](#564)) ([0058d3d](0058d3d))
@github-actions
Copy link

🎉 This PR is included in version 1.17.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants