Add Azure Storage CLI connection config to specs and yml.erb files #574
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <% | ||
| require "json" | ||
|
|
||
| def cli_cfg_with_default_timeout(connection_cfg, blobstore_type, default_seconds: 41) | ||
| cfg = (connection_cfg || {}).dup | ||
| if blobstore_type == 'storage_cli' | ||
| if !cfg.key?('put_timeout_in_seconds') || cfg['put_timeout_in_seconds'].to_s.empty? | ||
| cfg['put_timeout_in_seconds'] = default_seconds.to_s | ||
| end | ||
| end | ||
| cfg | ||
| end | ||
|
|
||
| def add(h, key, val) | ||
| return if val.nil? | ||
| return if val.respond_to?(:empty?) && val.empty? | ||
| h[key] = val | ||
| end | ||
|
|
||
| def options_for(scope_prefix, provider_prop) | ||
| provider = p(provider_prop, nil) | ||
| return {} unless provider == "AzureRM" | ||
|
|
||
| h = {} | ||
| h["provider"] = provider | ||
| h["account_name"] = p("#{scope_prefix}.azure_storage_account_name") | ||
| h["container_name"] = p("#{scope_prefix}.container_name") | ||
| add(h, "account_key", p("#{scope_prefix}.azure_storage_access_key")) | ||
| add(h, "environment", p("#{scope_prefix}.environment", "AzureCloud")) | ||
| add(h, "put_timeout_in_seconds", p("#{scope_prefix}.put_timeout_in_seconds", nil)) | ||
|
|
||
| # optional passthrough for extra storage-cli flags | ||
| begin | ||
| custom = p("#{scope_prefix}.custom", {}) | ||
| if custom.respond_to?(:each) | ||
| custom.each { |k, v| add(h, k.to_s, v) } | ||
| end | ||
| rescue | ||
| # property might not exist; ignore | ||
| end | ||
|
|
||
| cli_cfg_with_default_timeout(h, 'storage_cli') | ||
| end | ||
|
|
||
| all = { | ||
| "buildpacks" => options_for("cc.buildpacks.connection_config", "cc.buildpacks.blobstore_provider"), | ||
| "droplets" => options_for("cc.droplets.connection_config", "cc.droplets.blobstore_provider"), | ||
| "packages" => options_for("cc.packages.connection_config", "cc.packages.blobstore_provider"), | ||
| "resource_pool" => options_for("cc.resource_pool.connection_config", "cc.resource_pool.blobstore_provider"), | ||
| } | ||
| -%> | ||
| <%= JSON.pretty_generate(all) %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <% | ||
| require "json" | ||
|
|
||
| def cli_cfg_with_default_timeout(connection_cfg, blobstore_type, default_seconds: 41) | ||
| cfg = (connection_cfg || {}).dup | ||
| if blobstore_type == 'storage_cli' | ||
| if !cfg.key?('put_timeout_in_seconds') || cfg['put_timeout_in_seconds'].to_s.empty? | ||
| cfg['put_timeout_in_seconds'] = default_seconds.to_s | ||
| end | ||
| end | ||
| cfg | ||
| end | ||
|
|
||
| def add(h, key, val) | ||
| return if val.nil? | ||
| return if val.respond_to?(:empty?) && val.empty? | ||
| h[key] = val | ||
| end | ||
|
|
||
| def options_for(scope_prefix, provider_prop) | ||
| provider = p(provider_prop, nil) | ||
| return {} unless provider == "AzureRM" | ||
|
|
||
| h = {} | ||
| h["provider"] = provider | ||
| h["account_name"] = p("#{scope_prefix}.azure_storage_account_name") | ||
| h["container_name"] = p("#{scope_prefix}.container_name") | ||
| add(h, "account_key", p("#{scope_prefix}.azure_storage_access_key")) | ||
| add(h, "environment", p("#{scope_prefix}.environment", "AzureCloud")) | ||
| add(h, "put_timeout_in_seconds", p("#{scope_prefix}.put_timeout_in_seconds", nil)) | ||
|
|
||
| # optional passthrough for extra storage-cli flags | ||
| begin | ||
| custom = p("#{scope_prefix}.custom", {}) | ||
| if custom.respond_to?(:each) | ||
| custom.each { |k, v| add(h, k.to_s, v) } | ||
| end | ||
| rescue | ||
| # property might not exist; ignore | ||
| end | ||
|
|
||
| cli_cfg_with_default_timeout(h, 'storage_cli') | ||
| end | ||
|
|
||
| all = { | ||
| "buildpacks" => options_for("cc.buildpacks.connection_config", "cc.buildpacks.blobstore_provider"), | ||
| "droplets" => options_for("cc.droplets.connection_config", "cc.droplets.blobstore_provider"), | ||
| "packages" => options_for("cc.packages.connection_config", "cc.packages.blobstore_provider"), | ||
| "resource_pool" => options_for("cc.resource_pool.connection_config", "cc.resource_pool.blobstore_provider"), | ||
| } | ||
| -%> | ||
| <%= JSON.pretty_generate(all) %> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"AzureRM" originates from the fog-azure implementation. Should we use a different name? Maybe "azure-storage-cli"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or just azure
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or keep AzureRM = Azure Resource Manager