From c2631f208a27676daf78c43bb75871e03e6cb8e7 Mon Sep 17 00:00:00 2001 From: Michael Brewer Date: Sat, 25 May 2024 19:04:57 -0700 Subject: [PATCH 1/2] fix(cli): skip over coder_external_auth that are optional --- cli/cliui/externalauth.go | 3 +++ package-lock.json | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 package-lock.json diff --git a/cli/cliui/externalauth.go b/cli/cliui/externalauth.go index 2e416ae3b5825..b1dce47994db2 100644 --- a/cli/cliui/externalauth.go +++ b/cli/cliui/externalauth.go @@ -37,6 +37,9 @@ func ExternalAuth(ctx context.Context, writer io.Writer, opts ExternalAuthOption if auth.Authenticated { return nil } + if auth.Optional { + continue + } _, _ = fmt.Fprintf(writer, "You must authenticate with %s to create a workspace with this template. Visit:\n\n\t%s\n\n", auth.DisplayName, auth.AuthenticateURL) diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000000000..c6d9981e6edf3 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,47 @@ +{ + "name": "coder", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "coder", + "version": "0.0.0", + "dependencies": { + "exec": "^0.2.1" + }, + "devDependencies": { + "prettier": "3.0.0" + } + }, + "node_modules/.pnpm/exec@0.2.1/node_modules/exec": { + "version": "0.2.1", + "devDependencies": {}, + "engines": { + "node": ">= v0.9.1" + } + }, + "node_modules/.pnpm/prettier@3.0.0/node_modules/prettier": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/exec": { + "resolved": "node_modules/.pnpm/exec@0.2.1/node_modules/exec", + "link": true + }, + "node_modules/prettier": { + "resolved": "node_modules/.pnpm/prettier@3.0.0/node_modules/prettier", + "link": true + } + } +} From e00a01097206103ba5280efa80176831dfbed4a2 Mon Sep 17 00:00:00 2001 From: Michael Brewer Date: Sat, 25 May 2024 19:06:37 -0700 Subject: [PATCH 2/2] chore: Delete package-lock.json --- package-lock.json | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index c6d9981e6edf3..0000000000000 --- a/package-lock.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "coder", - "version": "0.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "coder", - "version": "0.0.0", - "dependencies": { - "exec": "^0.2.1" - }, - "devDependencies": { - "prettier": "3.0.0" - } - }, - "node_modules/.pnpm/exec@0.2.1/node_modules/exec": { - "version": "0.2.1", - "devDependencies": {}, - "engines": { - "node": ">= v0.9.1" - } - }, - "node_modules/.pnpm/prettier@3.0.0/node_modules/prettier": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, - "node_modules/exec": { - "resolved": "node_modules/.pnpm/exec@0.2.1/node_modules/exec", - "link": true - }, - "node_modules/prettier": { - "resolved": "node_modules/.pnpm/prettier@3.0.0/node_modules/prettier", - "link": true - } - } -}