Skip to content

Commit

Permalink
Merge branch 'main' of github.com:seamapi/seam-cli into semantic-release
Browse files Browse the repository at this point in the history
  • Loading branch information
andrii-balitskyi committed Jan 5, 2024
2 parents 939133b + e540622 commit 48c719b
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 22 deletions.
2 changes: 1 addition & 1 deletion cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { getApiDefinitions } from "./lib/get-api-definitions"
import commandLineUsage from "command-line-usage"
import { ContextHelpers } from "./lib/types"
import { version } from "./package.json"
import open from "open"

const sections = [
{
Expand Down Expand Up @@ -185,6 +184,7 @@ async function cli(args: ParsedArgs) {
})

if (action) {
const { default: open } = await import("open")
await open(url)
}
} else {
Expand Down
23 changes: 21 additions & 2 deletions lib/interact-for-open-api-object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,15 @@ export const interactForOpenApiObject = async (
const connected_account_id = await interactForConnectedAccount()
args.params[paramToEdit] = connected_account_id
return interactForOpenApiObject(args, ctx)
} else if (paramToEdit === "user_identity_id") {
} else if (
paramToEdit === "user_identity_id" ||
paramToEdit === "user_identity_ids"
) {
const user_identity_id = await interactForUserIdentity()
args.params[paramToEdit] = user_identity_id
args.params[paramToEdit] =
paramToEdit === "user_identity_ids"
? [user_identity_id]
: user_identity_id
return interactForOpenApiObject(args, ctx)
} else if (paramToEdit.endsWith("acs_system_id")) {
args.params[paramToEdit] = await interactForAcsSystem()
Expand Down Expand Up @@ -208,6 +214,19 @@ export const interactForOpenApiObject = async (
).value
args.params[paramToEdit] = value
return interactForOpenApiObject(args, ctx)
} else if (
prop.type === "array" &&
(prop as any)?.items?.type === "string"
) {
const value = (
await prompts({
name: "value",
message: `${paramToEdit}:`,
type: "text",
})
).value
args.params[paramToEdit] = [value]
return interactForOpenApiObject(args, ctx)
} else if (prop.type === "object") {
args.params[paramToEdit] = await interactForOpenApiObject(
{
Expand Down
2 changes: 1 addition & 1 deletion lib/interact-for-user-identity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const interactForUserIdentity = async () => {
type: "autocomplete",
message: "Select a user_identity:",
choices: uis.map((ui) => ({
title: `${ui.email_address} "${ui.first_name} ${ui.last_name}": ${ui.user_identity_key}`,
title: `${ui.email_address} "${ui.full_name}: ${ui.user_identity_key}`,
value: ui.user_identity_id,
description: ui.user_identity_id,
})),
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "seam-cli",
"module": "index.ts",
"type": "module",
"version": "0.0.27",
"version": "0.0.28",
"homepage": "https://github.com/seamapi/seam-cli",
"bugs": "https://github.com/seamapi/seam-cli/issues",
"repository": "seamapi/seam-cli",
Expand Down
33 changes: 19 additions & 14 deletions scripts/install.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# NOTICE:
# The following was adapted from the original source, and includes modified changes.
# Original source: https://github.com/DopplerHQ/cli/blob/08cd5113f646ed98d4ca806c204428c68a69b8a1/scripts/install.sh
#

#!/usr/bin/env sh

set -e
Expand Down Expand Up @@ -169,7 +187,7 @@ wget_download() {
if [ -z "$security_flags" ] && [ "$component" = "Binary" ]; then
log_debug "Skipping additional security flags that are unsupported by BusyBox wget"
# log to stderr b/c this function's stdout is parsed
log_warning "This system's wget binary is provided by BusyBox. Doppler strongly suggests installing GNU wget, which provides additional security features."
log_warning "This system's wget binary is provided by BusyBox. We strongly suggests installing GNU wget, which provides additional security features."
fi

# allow wget to fail w/o exiting
Expand Down Expand Up @@ -223,12 +241,6 @@ check_http_status() {
log ""
log "$error"

if [ "$status_code" -eq 404 ]; then
log ""
log "Please report this issue:"
log "https://github.com/DopplerHQ/cli/issues/new?template=bug_report.md&title=[BUG]%20Unexpected%20404%20using%20CLI%20install%20script"
fi

clean_exit 1
fi
}
Expand Down Expand Up @@ -265,9 +277,6 @@ case "$uname_os" in
*MINGW64*) os="win" ;;
*)
log "ERROR: Unsupported OS '$uname_os'"
log ""
log "Please report this issue:"
log "https://github.com/DopplerHQ/cli/issues/new?template=bug_report.md&title=[BUG]%20Unsupported%20OS"
clean_exit 1
;;
esac
Expand All @@ -290,9 +299,6 @@ elif [ "$uname_machine" = "arm64" ] || [ "$uname_machine" = "aarch64" ]; then
arch="arm64"
else
log "ERROR: Unsupported architecture '$uname_machine'"
log ""
log "Please report this issue:"
log "https://github.com/DopplerHQ/cli/issues/new?template=bug_report.md&title=[BUG]%20Unsupported%20architecture"
clean_exit 1
fi

Expand All @@ -309,7 +315,6 @@ fi
log_debug "Detected format '$format'"

url=https://github.com/seamapi/seam-cli/releases/download/v0.0.8/seam-$os
key_url="https://$DOPPLER_DOMAIN/keys/public"


set +e
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"lib": ["ES2015"],
"module": "ES2015",
"module": "ESNext",
"target": "ES2015",
"moduleResolution": "bundler",
"moduleDetection": "force",
Expand Down

0 comments on commit 48c719b

Please sign in to comment.