diff --git a/CHANGELOG.md b/CHANGELOG.md index 890cecb55f..e17c2c4474 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.46.2](https://github.com/heroku/cli/compare/v7.46.1...v7.46.2) (2020-10-22) + +**Note:** Version bump only for package heroku + + + + + ## [7.46.1](https://github.com/heroku/cli/compare/v7.46.0...v7.46.1) (2020-10-20) **Note:** Version bump only for package heroku diff --git a/docs/certs.md b/docs/certs.md index ac828cd843..b592facd2a 100644 --- a/docs/certs.md +++ b/docs/certs.md @@ -29,7 +29,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/index.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/index.js)_ ## `heroku certs:add CRT KEY` @@ -56,7 +56,7 @@ EXAMPLES $ heroku certs:add intermediary.crt example.com.crt example.com.key ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/add.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/add.js)_ ## `heroku certs:auto` @@ -71,7 +71,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/index.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/index.js)_ ## `heroku certs:auto:disable` @@ -86,7 +86,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/disable.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/disable.js)_ ## `heroku certs:auto:enable` @@ -101,7 +101,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/enable.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/enable.js)_ ## `heroku certs:auto:refresh` @@ -116,7 +116,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/refresh.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/refresh.js)_ ## `heroku certs:chain` @@ -131,7 +131,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/chain.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/chain.js)_ ## `heroku certs:generate DOMAIN` @@ -163,7 +163,7 @@ EXAMPLES $ heroku certs:generate example.com ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/generate.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/generate.js)_ ## `heroku certs:info` @@ -180,7 +180,7 @@ OPTIONS --name=name name to check info on ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/info.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/info.js)_ ## `heroku certs:key` @@ -202,7 +202,7 @@ EXAMPLES $ heroku certs:key example.com.crt example.com.key ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/key.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/key.js)_ ## `heroku certs:remove` @@ -219,7 +219,7 @@ OPTIONS --name=name name to remove ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/remove.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/remove.js)_ ## `heroku certs:update CRT KEY` @@ -246,4 +246,4 @@ EXAMPLES $ heroku certs:update intermediary.crt example.com.crt example.com.key ``` -_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/update.js)_ +_See code: [@heroku-cli/plugin-certs-v5](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/update.js)_ diff --git a/lerna.json b/lerna.json index ced1c6bb0c..a0a9ef8018 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "7.46.1", + "version": "7.46.2", "useWorkspaces": true, "npmClient": "yarn", "command": { diff --git a/packages/certs-v5/CHANGELOG.md b/packages/certs-v5/CHANGELOG.md index 5d3a6a5390..d0e5722f48 100644 --- a/packages/certs-v5/CHANGELOG.md +++ b/packages/certs-v5/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.46.2](https://github.com/heroku/cli/compare/v7.46.1...v7.46.2) (2020-10-22) + + +### Bug Fixes + +* **certs-v5:** fix logic for requesting all cert resources ([#1661](https://github.com/heroku/cli/issues/1661)) ([46187e5](https://github.com/heroku/cli/commit/46187e5aef89b6d8d152ceb63653c62b49021e84)) + + + + + ## [7.43.1](https://github.com/heroku/cli/compare/v7.43.0...v7.43.1) (2020-09-21) diff --git a/packages/certs-v5/README.md b/packages/certs-v5/README.md index 6c96ed6599..933814df8c 100644 --- a/packages/certs-v5/README.md +++ b/packages/certs-v5/README.md @@ -33,7 +33,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [commands/certs/index.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/index.js)_ +_See code: [commands/certs/index.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/index.js)_ ## `heroku certs:add CRT KEY` @@ -60,7 +60,7 @@ EXAMPLES $ heroku certs:add intermediary.crt example.com.crt example.com.key ``` -_See code: [commands/certs/add.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/add.js)_ +_See code: [commands/certs/add.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/add.js)_ ## `heroku certs:auto` @@ -75,7 +75,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [commands/certs/auto/index.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/index.js)_ +_See code: [commands/certs/auto/index.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/index.js)_ ## `heroku certs:auto:disable` @@ -90,7 +90,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [commands/certs/auto/disable.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/disable.js)_ +_See code: [commands/certs/auto/disable.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/disable.js)_ ## `heroku certs:auto:enable` @@ -105,7 +105,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [commands/certs/auto/enable.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/enable.js)_ +_See code: [commands/certs/auto/enable.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/enable.js)_ ## `heroku certs:auto:refresh` @@ -120,7 +120,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [commands/certs/auto/refresh.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/auto/refresh.js)_ +_See code: [commands/certs/auto/refresh.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/auto/refresh.js)_ ## `heroku certs:chain` @@ -135,7 +135,7 @@ OPTIONS -r, --remote=remote git remote of app to use ``` -_See code: [commands/certs/chain.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/chain.js)_ +_See code: [commands/certs/chain.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/chain.js)_ ## `heroku certs:generate DOMAIN` @@ -167,7 +167,7 @@ EXAMPLES $ heroku certs:generate example.com ``` -_See code: [commands/certs/generate.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/generate.js)_ +_See code: [commands/certs/generate.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/generate.js)_ ## `heroku certs:info` @@ -184,7 +184,7 @@ OPTIONS --name=name name to check info on ``` -_See code: [commands/certs/info.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/info.js)_ +_See code: [commands/certs/info.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/info.js)_ ## `heroku certs:key` @@ -206,7 +206,7 @@ EXAMPLES $ heroku certs:key example.com.crt example.com.key ``` -_See code: [commands/certs/key.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/key.js)_ +_See code: [commands/certs/key.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/key.js)_ ## `heroku certs:remove` @@ -223,7 +223,7 @@ OPTIONS --name=name name to remove ``` -_See code: [commands/certs/remove.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/remove.js)_ +_See code: [commands/certs/remove.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/remove.js)_ ## `heroku certs:update CRT KEY` @@ -250,5 +250,5 @@ EXAMPLES $ heroku certs:update intermediary.crt example.com.crt example.com.key ``` -_See code: [commands/certs/update.js](https://github.com/heroku/cli/blob/v7.43.1/packages/certs-v5/commands/certs/update.js)_ +_See code: [commands/certs/update.js](https://github.com/heroku/cli/blob/v7.46.2/packages/certs-v5/commands/certs/update.js)_ diff --git a/packages/certs-v5/commands/certs/add.js b/packages/certs-v5/commands/certs/add.js index adb090f12b..e4eb63672e 100644 --- a/packages/certs-v5/commands/certs/add.js +++ b/packages/certs-v5/commands/certs/add.js @@ -14,7 +14,7 @@ let isWildcard = require('../../lib/is_wildcard.js') let isWildcardMatch = require('../../lib/is_wildcard_match.js') let getCertAndKey = require('../../lib/get_cert_and_key.js') let matchDomains = require('../../lib/match_domains.js') -let checkMultiSniFeature = require('../../lib/features.js') +let { checkMultiSniFeature } = require('../../lib/features.js') let { waitForDomains, printDomains } = require('../../lib/domains') function Domains (domains) { diff --git a/packages/certs-v5/lib/endpoints.js b/packages/certs-v5/lib/endpoints.js index f574e1fe9a..e31d12e2b5 100644 --- a/packages/certs-v5/lib/endpoints.js +++ b/packages/certs-v5/lib/endpoints.js @@ -1,6 +1,6 @@ 'use strict' -let checkMultiSniFeature = require('./features.js') +const { checkPrivateSniFeature } = require('./features.js') function sslCertsPromise (app, heroku) { return heroku.request({ @@ -58,12 +58,11 @@ function tagAndSort (app, allCerts) { function * all (appName, heroku) { const featureList = yield heroku.get(`/apps/${appName}/features`) - const multipleSniEndpointFeatureEnabled = checkMultiSniFeature(featureList) - const isSpaceApp = yield hasSpace(appName, heroku) + const privateSniFeatureEnabled = checkPrivateSniFeature(featureList) let allCerts; - if (multipleSniEndpointFeatureEnabled && isSpaceApp) { + if (privateSniFeatureEnabled) { // use SNI endpoints only allCerts = yield { ssl_certs: [], diff --git a/packages/certs-v5/lib/features.js b/packages/certs-v5/lib/features.js index 4e9746c89e..5adab1d7fa 100644 --- a/packages/certs-v5/lib/features.js +++ b/packages/certs-v5/lib/features.js @@ -1,7 +1,15 @@ const MULTIPLE_SNI_ENDPOINT_FLAG = 'allow-multiple-sni-endpoints' +const PRIVATE_SNI_ENDPOINT_FLAG = 'private-spaces-sni' function checkMultiSniFeature(featureList) { return featureList.some(feature => feature.name === MULTIPLE_SNI_ENDPOINT_FLAG && feature.enabled === true) } -module.exports = checkMultiSniFeature +function checkPrivateSniFeature(featureList) { + return featureList.some(feature => feature.name === PRIVATE_SNI_ENDPOINT_FLAG && feature.enabled === true) +} + +module.exports = { + checkMultiSniFeature, + checkPrivateSniFeature +} diff --git a/packages/certs-v5/package.json b/packages/certs-v5/package.json index f49da860a7..2c43f330d6 100644 --- a/packages/certs-v5/package.json +++ b/packages/certs-v5/package.json @@ -1,7 +1,7 @@ { "name": "@heroku-cli/plugin-certs-v5", "description": "heroku ssl plugin", - "version": "7.43.1", + "version": "7.46.2", "author": "Ransom Briggs rbriggs@heroku.com", "bugs": "https://github.com/heroku/cli/issues", "cli-engine": { diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 890cecb55f..e17c2c4474 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.46.2](https://github.com/heroku/cli/compare/v7.46.1...v7.46.2) (2020-10-22) + +**Note:** Version bump only for package heroku + + + + + ## [7.46.1](https://github.com/heroku/cli/compare/v7.46.0...v7.46.1) (2020-10-20) **Note:** Version bump only for package heroku diff --git a/packages/cli/package.json b/packages/cli/package.json index d95ce0cd17..6ce1f67da1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "heroku", "description": "CLI to interact with Heroku", - "version": "7.46.1", + "version": "7.46.2", "author": "Jeff Dickey @jdxcode", "bin": { "heroku": "./bin/run" @@ -17,7 +17,7 @@ "@heroku-cli/plugin-autocomplete": "^7.43.0", "@heroku-cli/plugin-buildpacks": "^7.43.0", "@heroku-cli/plugin-certs": "^7.43.0", - "@heroku-cli/plugin-certs-v5": "^7.43.1", + "@heroku-cli/plugin-certs-v5": "^7.46.2", "@heroku-cli/plugin-ci": "^7.43.0", "@heroku-cli/plugin-ci-v5": "^7.43.0", "@heroku-cli/plugin-config": "^7.43.0",