Move env_tags under env key

Instead of:

```
env:
  CLEAR_TAG: untagged
env_tags:
  tag1:
    CLEAR_TAG: tagged
```

We'll have:

```
env:
  clear:
    CLEAR_TAG: untagged
  tags:
    tag1:
      CLEAR_TAG: tagged
```
This commit is contained in:
Donal McBreen
2024-05-15 10:19:22 +01:00
parent f98380ef0c
commit f48c227768
7 changed files with 44 additions and 34 deletions

View File

@@ -234,7 +234,7 @@ class Kamal::Configuration
end
def env_tags
raw_config.env_tags.collect { |name, config| Kamal::Configuration::Env::Tag.new(name, config: config) }
raw_config.env["tags"].collect { |name, config| Kamal::Configuration::Env::Tag.new(name, config: config) }
end
def env_tag(name)

View File

@@ -4,7 +4,7 @@ class Kamal::Configuration::Env
def self.from_config(config:, secrets_file: nil)
secrets_keys = config.fetch("secret", [])
clear = config.fetch("clear", config.key?("secret") ? {} : config)
clear = config.fetch("clear", config.key?("secret") || config.key?("tags") ? {} : config)
new clear: clear, secrets_keys: secrets_keys, secrets_file: secrets_file
end