awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Infisical/infisical

Browse Source
This commit is contained in:
Vladyslav Matsiiako
2022-11-26 17:55:31 -05:00
parent ca3b2fa1a0 4ea284a1c5
commit 065b37ac11
9 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/config/index.ts
View File

@@ -1,5 +1,5 @@
const PORT = process.env.PORT || 4000; const PORT = process.env.PORT || 4000;
const EMAIL_TOKEN_LIFETIME = process.env.EMAIL_TOKEN_LIFETIME! || '86400'; // investigate const EMAIL_TOKEN_LIFETIME = process.env.EMAIL_TOKEN_LIFETIME! || '86400';
const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY!; const ENCRYPTION_KEY = process.env.ENCRYPTION_KEY!;
const JWT_AUTH_LIFETIME = process.env.JWT_AUTH_LIFETIME! || '10d'; const JWT_AUTH_LIFETIME = process.env.JWT_AUTH_LIFETIME! || '10d';
const JWT_AUTH_SECRET = process.env.JWT_AUTH_SECRET!; const JWT_AUTH_SECRET = process.env.JWT_AUTH_SECRET!;

1
backend/src/controllers/organizationController.ts
View File

@@ -8,6 +8,7 @@ import {
STRIPE_PRODUCT_CARD_AUTH STRIPE_PRODUCT_CARD_AUTH
} from '../config'; } from '../config';
import Stripe from 'stripe'; import Stripe from 'stripe';
const stripe = new Stripe(STRIPE_SECRET_KEY, { const stripe = new Stripe(STRIPE_SECRET_KEY, {
apiVersion: '2022-08-01' apiVersion: '2022-08-01'
}); });

2
cli/packages/cmd/root.go
View File

@@ -15,7 +15,7 @@ var rootCmd = &cobra.Command{
Short: "Infisical CLI is used to inject environment variables into any process", Short: "Infisical CLI is used to inject environment variables into any process",
Long: `Infisical is a simple, end-to-end encrypted service that enables teams to sync and manage their environment variables across their development life cycle.`, Long: `Infisical is a simple, end-to-end encrypted service that enables teams to sync and manage their environment variables across their development life cycle.`,
CompletionOptions: cobra.CompletionOptions{DisableDefaultCmd: true}, CompletionOptions: cobra.CompletionOptions{DisableDefaultCmd: true},
Version: "0.1.4", Version: "0.1.5",
} }
// Execute adds all child commands to the root command and sets flags appropriately. // Execute adds all child commands to the root command and sets flags appropriately.

6
cli/packages/cmd/run.go
View File

@@ -33,7 +33,7 @@ var runCmd = &cobra.Command{
return return
} }
substitute, err := cmd.Flags().GetBool("substitute") shouldExpandSecrets, err := cmd.Flags().GetBool("expand")
if err != nil { if err != nil {
log.Errorln("Unable to parse the substitute flag") log.Errorln("Unable to parse the substitute flag")
log.Debugln(err) log.Debugln(err)
@@ -89,7 +89,7 @@ var runCmd = &cobra.Command{
} }
} }
if substitute { if shouldExpandSecrets {
substitutions := util.SubstituteSecrets(envsFromApi) substitutions := util.SubstituteSecrets(envsFromApi)
execCmd(args[0], args[1:], substitutions) execCmd(args[0], args[1:], substitutions)
} else { } else {
@@ -103,7 +103,7 @@ func init() {
rootCmd.AddCommand(runCmd) rootCmd.AddCommand(runCmd)
runCmd.Flags().StringP("env", "e", "dev", "Set the environment (dev, prod, etc.) from which your secrets should be pulled from") runCmd.Flags().StringP("env", "e", "dev", "Set the environment (dev, prod, etc.) from which your secrets should be pulled from")
runCmd.Flags().String("projectId", "", "The project ID from which your secrets should be pulled from") runCmd.Flags().String("projectId", "", "The project ID from which your secrets should be pulled from")
runCmd.Flags().Bool("substitute", true, "Parse shell variable substitutions in your secrets") runCmd.Flags().Bool("expand", true, "Parse shell parameter expansions in your secrets")
} }
// Credit: inspired by AWS Valut // Credit: inspired by AWS Valut

2
docker-compose.dev.yml
View File

@@ -55,6 +55,8 @@ services:
- NEXT_PUBLIC_WEBSITE_URL=${SITE_URL} - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
- NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST} - NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST}
- NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY} - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
- NEXT_PUBLIC_STRIPE_PRODUCT_PRO=${STRIPE_PRODUCT_PRO}
- NEXT_PUBLIC_STRIPE_PRODUCT_STARTER=${STRIPE_PRODUCT_STARTER}
- NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED} - NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
networks: networks:
- infisical-dev - infisical-dev

3
docker-compose.yml
View File

@@ -49,6 +49,9 @@ services:
- NEXT_PUBLIC_WEBSITE_URL=${SITE_URL} - NEXT_PUBLIC_WEBSITE_URL=${SITE_URL}
- NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST} - NEXT_PUBLIC_POSTHOG_HOST=${POSTHOG_HOST}
- NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY} - NEXT_PUBLIC_POSTHOG_API_KEY=${POSTHOG_PROJECT_API_KEY}
- NEXT_PUBLIC_STRIPE_PRODUCT_PRO=${STRIPE_PRODUCT_PRO}
- NEXT_PUBLIC_STRIPE_PRODUCT_STARTER=${STRIPE_PRODUCT_STARTER}
- NEXT_PUBLIC_TELEMETRY_ENABLED=${TELEMETRY_ENABLED}
networks: networks:
- infisical - infisical

9
docs/cli/reference/run.mdx
View File

@@ -12,7 +12,8 @@ Inject environment variables from the platform into an application process.
## Options ## Options
| Option | Description | Default value | | Option | Description | Default value |
| ------------- | ----------------------------------------------------------------------------------------------------------- | ------------- | | -------------- | ----------------------------------------------------------------------------------------------------------- | ------------- |
| `--env` | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev` | | `--env` | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev` |
| `--projectId` | Used to link a local project to the platform (required only if injecting via the service token method) | `None` | | `--projectId` | Used to link a local project to the platform (required only if injecting via the service token method) | `None` |
| `--expand` | Parse shell parameter expansions in your secrets (e.g., `${DOMAIN}`) | `true` |

9
docs/cli/usage.mdx
View File

@@ -29,10 +29,11 @@ infisical run -- [your application start command]
Options you can specify: Options you can specify:
| Option | Description | Default value | | Option | Description | Default value |
| ------------- | ----------------------------------------------------------------------------------------------------------- | ------------- | | ------------- | ----------------------------------------------------------------------------------------------------------- | ------------- |
| `--env` | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev` | | `--env` | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev` |
| `--projectId` | Used to link a local project to the platform (required only if injecting via the service token method) | `None` | | `--projectId` | Used to link a local project to the platform (required only if injecting via the service token method) | `None` |
| `--expand` | Parse shell parameter expansions in your secrets (e.g., `${DOMAIN}`) | `true` |
## Examples: ## Examples:

1
frontend/pages/settings/billing/[id].js
View File

@@ -50,6 +50,7 @@ export default function SettingsBilling() {
const subscriptions = await getOrganizationSubscriptions({ const subscriptions = await getOrganizationSubscriptions({
orgId: localStorage.getItem("orgData.id"), orgId: localStorage.getItem("orgData.id"),
}); });
setCurrentPlan(subscriptions.data[0].plan.product); setCurrentPlan(subscriptions.data[0].plan.product);
const orgUsers = await getOrganizationUsers({ const orgUsers = await getOrganizationUsers({
orgId: localStorage.getItem("orgData.id"), orgId: localStorage.getItem("orgData.id"),