Skip to content

Commit

Permalink
fix: Converted params ref to armParameters (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlie Sperbeck authored and whilke committed Jul 3, 2019
1 parent 1988506 commit 6077867
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 17 deletions.
6 changes: 1 addition & 5 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
registry=https://registry.npmjs.org/
//registry.npmjs.org/:username=csperbeckhchb
//registry.npmjs.org/:_password="ZzJvY3llWmZEQTVAVGNzaDVmJGQleCFORmMhSFloaCQ="
//registry.npmjs.org/:email=csperbeckhchb
//registry.npmjs.org/:always-auth=true
registry=https://registry.npmjs.org/
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ steps:
command: 'install'
workingDir: '$(System.DefaultWorkingDirectory)'
customRegistry: 'useNpmrc'
customEndpoint: '$(NPM_SERVICE_CONNECTION)'
customEndpoint: 'hchb-npm-public-registry'
verbose: true

- task: gulp@1
Expand Down
10 changes: 5 additions & 5 deletions ingredient/ingredient-service-bus-namespace/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ export class ServiceBusNamespace extends BaseIngredient {
}
}

if (!params["diagnosticsEnabled"])
params["diagnosticsEnabled"] = {"value": "yes"}
if (!armParameters["diagnosticsEnabled"])
armParameters["diagnosticsEnabled"] = {"value": "yes"}

if (params["diagnosticsEnabled"].value == "yes") {
if (armParameters["diagnosticsEnabled"].value == "yes") {
const ehnUtils = IngredientManager.getIngredientFunction("eventhubnamespace", this._ctx)

var diagnosticsEventHubNamespace = ehnUtils.get_resource_name("diagnostics");
params["diagnosticsEventHubNamespace"] = {"value": diagnosticsEventHubNamespace};
armParameters["diagnosticsEventHubNamespace"] = {"value": diagnosticsEventHubNamespace};

var diagnosticsEventHubNamespaceResourceGroup: string

diagnosticsEventHubNamespaceResourceGroup = await util.resource_group("diagnostics");

params["diagnosticsEventHubResourceGroup"] = {"value": diagnosticsEventHubNamespaceResourceGroup};
armParameters["diagnosticsEventHubResourceGroup"] = {"value": diagnosticsEventHubNamespaceResourceGroup};
}

await helper.DeployTemplate(this._name, ARMTemplate, armParameters, resourceGroupName)
Expand Down
27 changes: 21 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6077867

Please sign in to comment.