@cloudant/couchbackup - npm Package Compare versions

bin/couchbackup.bin.js

		@@ -34,3 +34,4 @@ #!/usr/bin/env node
		resume: program.resume,
		iamApiKey: program.iamApiKey
		iamApiKey: program.iamApiKey,
		iamTokenUrl: program.iamTokenUrl
		};
		@@ -37,0 +38,0 @@

bin/couchrestore.bin.js

		@@ -29,3 +29,4 @@ #!/usr/bin/env node
		parallelism: program.parallelism,
		iamApiKey: program.iamApiKey
		iamApiKey: program.iamApiKey,
		iamTokenUrl: program.iamTokenUrl
		};
		@@ -32,0 +33,0 @@

CHANGES.md

		@@ -0,1 +1,5 @@
		# Unreleased

		- [FIXED] IAM token URL override option.

		# 2.3.0 (2018-05-22)
		@@ -2,0 +6,0 @@

includes/parser.js

		@@ -61,2 +61,5 @@ // Copyright © 2017, 2018 IBM Corp. All rights reserved.

		// Special case the iamTokenUrl which is only an env var
		program.iamTokenUrl = defaults.iamTokenUrl;

		if (program.resume && (program.log === defaults.log)) {
		@@ -98,2 +101,5 @@ // If resuming and the log file arg is the newly generated tmp name from defaults then we know that --log wasn't specified.

		// Special case the iamTokenUrl which is only an env var
		program.iamTokenUrl = defaults.iamTokenUrl;

		return program;
		@@ -100,0 +106,0 @@ }

includes/request.js

		@@ -40,4 +40,4 @@ // Copyright © 2017, 2018 IBM Corp. All rights reserved.
		const iamPluginConfig = {iamApiKey: opts.iamApiKey};
		if (opts.iamTokenEndpoint) {
		iamPluginConfig.iamTokenEndpoint = opts.iamTokenEndpoint;
		if (opts.iamTokenUrl) {
		iamPluginConfig.iamTokenUrl = opts.iamTokenUrl;
		}
		@@ -44,0 +44,0 @@ pluginsToUse.push({iamauth: iamPluginConfig});

package.json

		{
		"name": "@cloudant/couchbackup",
		"version": "2.3.1-SNAPSHOT.135",
		"version": "2.3.1-SNAPSHOT.136",
		"description": "CouchBackup - command-line backup utility for Cloudant/CouchDB",
		@@ -5,0 +5,0 @@ "homepage": "https://github.com/cloudant/couchbackup",

README.md

		@@ -200,4 +200,8 @@ # CouchBackup

		### Command-line paramters
		_Note:_ These environment variables can only be used with the CLI. When
		[using programmatically](#using-programmatically) the `opts` dictionary must be
		used.

		### Command-line parameters

		* `--url` - same as `COUCH_URL` environment variable
		@@ -252,4 +256,4 @@ * `--db` - same as `COUCH_DATABASE`
		* `iamApiKey`: see `CLOUDANT_IAM_API_KEY`.
		* `iamTokenUrl` : may be used with `key` to override the default URL for
		retrieving IAM tokens.
		* `iamTokenUrl`: may be used with `iamApiKey` to override the default URL for
		retrieving IAM tokens.

		@@ -313,2 +317,5 @@ The callback has the standard `err, data` parameters and is called when
		* `bufferSize`: see `COUCH_BUFFER_SIZE`.
		* `iamApiKey`: see `CLOUDANT_IAM_API_KEY`.
		* `iamTokenUrl`: may be used with `iamApiKey` to override the default URL for
		retrieving IAM tokens.

		@@ -315,0 +322,0 @@ The callback has the standard `err, data` parameters and is called when

New alerts