@codiac.io/codiac-cli 1.3.108 → 1.3.109

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -21,7 +21,7 @@ $ npm install -g @codiac.io/codiac-cli
21
21
  $ codiac COMMAND
22
22
  running command...
23
23
  $ codiac (--version|-v)
24
- @codiac.io/codiac-cli/1.3.108 linux-x64 node-v16.17.1
24
+ @codiac.io/codiac-cli/1.3.109 linux-x64 node-v16.17.1
25
25
  $ codiac --help [COMMAND]
26
26
  USAGE
27
27
  $ codiac COMMAND
@@ -28,7 +28,7 @@ class CspLogin extends command_base_enterprise_1.CommandBaseEnterprise {
28
28
  this.bootstrap();
29
29
  const { args, flags } = yield this.parse(CspLogin);
30
30
  (_a = this._relayContainer) === null || _a === void 0 ? void 0 : _a.ready$.subscribe(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
31
- var _b, _c;
31
+ var _b, _c, _d;
32
32
  try {
33
33
  if (flags.silent === true)
34
34
  this.__ui = new ops_1.ThrowingUserInputProvider(this.logger);
@@ -76,7 +76,7 @@ class CspLogin extends command_base_enterprise_1.CommandBaseEnterprise {
76
76
  let req = {
77
77
  providerCode: provider,
78
78
  credsType: 'client_credentials',
79
- username: "<not_relevant>",
79
+ username: (_b = flags.user) !== null && _b !== void 0 ? _b : "<CspTenantClientId>",
80
80
  secret: clientSecret,
81
81
  providerSubscription: cspTenant.subscriptionId,
82
82
  providerTenant: cspTenant.tenantId
@@ -128,7 +128,7 @@ class CspLogin extends command_base_enterprise_1.CommandBaseEnterprise {
128
128
  this._ui.userMessage(this._styler.colorGood("Success!").concat(" Authenticated with ", provider, " as ", this._styler.hilite(cspUser.username), subx));
129
129
  }
130
130
  catch (err) {
131
- this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_b = err.name) !== null && _b !== void 0 ? _b : ""} ${(_c = err.message) !== null && _c !== void 0 ? _c : ""}`);
131
+ this._ui.userMessage(`${this._styler.colorCritical("FAILED")} ${(_c = err.name) !== null && _c !== void 0 ? _c : ""} ${(_d = err.message) !== null && _d !== void 0 ? _d : ""}`);
132
132
  }
133
133
  }
134
134
  resolve();
@@ -163,15 +163,17 @@ CspLogin.examples = [
163
163
  'cat mypassword.txt | cod csp login -u me@mydomain.com --silent docker',
164
164
  'cat theclientsecret.txt | cod csp login --clientSecret --silent azure',
165
165
  'cat theclientsecret.txt | cod csp login --clientSecret --tenantId xy12pd34-a828-43d7-89c9-e52dg3cc2a7a --silent azure',
166
+ 'cat theclientsecret.txt | cod csp login --clientSecret --tenantId xy12pd34-a828-43d7-89c9-e52dg3cc2a7a -u abacab99-b1c2-45tu-m240gaddrac --silent azure',
167
+ 'cod csp login --clientSecret --tenantId xy12pd34-a828-43d7-89c9-e52dg3cc2a7a -u abacab99-b1c2-45tu-m240gaddrac azure',
166
168
  'cod csp login -u ASIAZ3XYZPDQ123 -p $(cat my-aws-secret-key.txt) aws',
167
169
  'cod csp login -u ASIAZ3XYZPDQ123 -p $(cat my-aws-secret-key.txt) --aws-session-token $(cat my-aws-sesh.txt) aws'
168
170
  ];
169
171
  // static dependsOn = ["provider"]; // this isnt the whole of the requirements
170
172
  CspLogin.flags = {
171
- user: core_1.Flags.string({ char: 'u', description: 'The username at the given cloud provider.', exclusive: ["clientSecret"] }),
173
+ user: core_1.Flags.string({ char: 'u', description: 'The username at the given cloud provider.' /*, exclusive: ["clientSecret"] */ }),
172
174
  password: core_1.Flags.string({ char: 'p', description: '(must be provided via stdin) The password at the given cloud provider.', exclusive: ["clientSecret"] }),
173
175
  "aws-session-token": core_1.Flags.string({ required: false, exclusive: ["clientSecret"], description: "(for AWS only) The session token parameter for use when authenticating with a short-term AWS access key credentials." }),
174
- clientSecret: core_1.Flags.boolean({ exclusive: ["user", "password"], description: '(must be provided interactively or via stdin) Invokes the OAuth Client Credentials Flow. Used to authenticate when no user is present, such as an internal service or in a devops pipeline. Note: This is a secret that must be created when Codiac gets registered as a trusted application in your cloud service provider subscription (eg: in azure, this is an app registration in Azure AD).' }),
176
+ clientSecret: core_1.Flags.boolean({ exclusive: ["password"], description: '(must be provided interactively or via stdin) Invokes the OAuth Client Credentials Flow. Used to authenticate when no user is present, such as an internal service or in a devops pipeline. Note: This is a secret that must be created when Codiac gets registered as a trusted application in your cloud service provider subscription (eg: in azure, this is an app registration in Azure AD).' }),
175
177
  subscriptionId: core_1.Flags.string({ char: 's', description: '(in silent mode, either this or tenantId is required if you have more than one tenant profile on a given cloud provider) The Id of the cloud provider subscription under which to authenticate.' }),
176
178
  tenantId: core_1.Flags.string({ char: 't', description: '(in silent mode, either this or subscriptionId is required if you have more than one tenant profile on a given cloud provider) The Id of the cloud provider tenant under which to authenticate.' }),
177
179
  silent: core_1.Flags.boolean({ char: 'y', required: false, description: `(Optional: defaults to false) Suppresses any user-interaction.` })
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/csp/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/csp/login.ts"],"names":[],"mappings":"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"}
@@ -18,7 +18,7 @@ const INTERFACES_CLI_1 = require("../ops/INTERFACES_CLI");
18
18
  const Docker = require("dockerode");
19
19
  const entities_1 = require("../ops/entities");
20
20
  const DEFAULT_IMAGE_NAME = "codiacimages/codiac-relay";
21
- exports.DEFAULT_IMAGE_TAG = "1.6.32";
21
+ exports.DEFAULT_IMAGE_TAG = "1.6.33";
22
22
  const DEFAULT_CONTAINER_NAME = "codiac-relay";
23
23
  const DEFAULT_HEALTH_CHECK_URL = "http://localhost:5799/heartbeat-json"; // /ready-state";
24
24
  const DEFAULT_RETRY_TIMOUT_IN_MINUTES = 1;
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.3.108",
2
+ "version": "1.3.109",
3
3
  "commands": {
4
4
  "branch": {
5
5
  "id": "branch",
@@ -3582,6 +3582,8 @@
3582
3582
  "cat mypassword.txt | cod csp login -u me@mydomain.com --silent docker",
3583
3583
  "cat theclientsecret.txt | cod csp login --clientSecret --silent azure",
3584
3584
  "cat theclientsecret.txt | cod csp login --clientSecret --tenantId xy12pd34-a828-43d7-89c9-e52dg3cc2a7a --silent azure",
3585
+ "cat theclientsecret.txt | cod csp login --clientSecret --tenantId xy12pd34-a828-43d7-89c9-e52dg3cc2a7a -u abacab99-b1c2-45tu-m240gaddrac --silent azure",
3586
+ "cod csp login --clientSecret --tenantId xy12pd34-a828-43d7-89c9-e52dg3cc2a7a -u abacab99-b1c2-45tu-m240gaddrac azure",
3585
3587
  "cod csp login -u ASIAZ3XYZPDQ123 -p $(cat my-aws-secret-key.txt) aws",
3586
3588
  "cod csp login -u ASIAZ3XYZPDQ123 -p $(cat my-aws-secret-key.txt) --aws-session-token $(cat my-aws-sesh.txt) aws"
3587
3589
  ],
@@ -3591,10 +3593,7 @@
3591
3593
  "type": "option",
3592
3594
  "char": "u",
3593
3595
  "description": "The username at the given cloud provider.",
3594
- "multiple": false,
3595
- "exclusive": [
3596
- "clientSecret"
3597
- ]
3596
+ "multiple": false
3598
3597
  },
3599
3598
  "password": {
3600
3599
  "name": "password",
@@ -3622,7 +3621,6 @@
3622
3621
  "description": "(must be provided interactively or via stdin) Invokes the OAuth Client Credentials Flow. Used to authenticate when no user is present, such as an internal service or in a devops pipeline. Note: This is a secret that must be created when Codiac gets registered as a trusted application in your cloud service provider subscription (eg: in azure, this is an app registration in Azure AD).",
3623
3622
  "allowNo": false,
3624
3623
  "exclusive": [
3625
- "user",
3626
3624
  "password"
3627
3625
  ]
3628
3626
  },
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@codiac.io/codiac-cli",
3
3
  "description": "Local command line interface for managing enterprise assets and environments.",
4
- "version": "1.3.108",
4
+ "version": "1.3.109",
5
5
  "author": "Codiac",
6
6
  "bin": {
7
7
  "codiac": "./bin/run",