Skip to content

Commit

Permalink
Merge pull request #212 from Infisical/patch-integrations
Browse files Browse the repository at this point in the history
Bring back sync integrations to CRUD secrets routes
  • Loading branch information
dangtony98 authored Jan 11, 2023
2 parents 286184a + b8f1024 commit acaae0b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 1,694 deletions.
25 changes: 24 additions & 1 deletion backend/src/controllers/v2/secretsController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
ACTION_DELETE_SECRETS
} from '../../variables';
import { ValidationError } from '../../utils/errors';
import { EventService } from '../../services';
import { eventPushSecrets } from '../../events';
import { EESecretService, EELogService } from '../../ee/services';
import { postHogClient } from '../../services';
import { BadRequestError } from '../../utils/errors';
Expand Down Expand Up @@ -102,6 +104,13 @@ export const createSecrets = async (req: Request, res: Response) => {
}))
});

// trigger event - push secrets
await EventService.handleEvent({
event: eventPushSecrets({
workspaceId
})
});

const addAction = await EELogService.createActionSecret({
name: ACTION_ADD_SECRETS,
userId: req.user._id.toString(),
Expand Down Expand Up @@ -194,7 +203,7 @@ export const getSecrets = async (req: Request, res: Response) => {

if (postHogClient) {
postHogClient.capture({
event: 'secrets deleted',
event: 'secrets added',
distinctId: req.user.email,
properties: {
numberOfSecrets: secrets.length,
Expand Down Expand Up @@ -321,6 +330,7 @@ export const updateSecrets = async (req: Request, res: Response) => {
})
});


// group secrets into workspaces so updated secrets can
// be logged and snapshotted separately for each workspace
const workspaceSecretObj: any = {};
Expand All @@ -333,6 +343,13 @@ export const updateSecrets = async (req: Request, res: Response) => {
});

Object.keys(workspaceSecretObj).forEach(async (key) => {
// trigger event - push secrets
await EventService.handleEvent({
event: eventPushSecrets({
workspaceId: key
})
});

const updateAction = await EELogService.createActionSecret({
name: ACTION_UPDATE_SECRETS,
userId: req.user._id.toString(),
Expand Down Expand Up @@ -409,6 +426,12 @@ export const deleteSecrets = async (req: Request, res: Response) => {
});

Object.keys(workspaceSecretObj).forEach(async (key) => {
// trigger event - push secrets
await EventService.handleEvent({
event: eventPushSecrets({
workspaceId: key
})
});
const deleteAction = await EELogService.createActionSecret({
name: ACTION_DELETE_SECRETS,
userId: req.user._id.toString(),
Expand Down
6 changes: 3 additions & 3 deletions backend/src/variables/integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const INTEGRATION_OPTIONS = [
name: 'Vercel',
slug: 'vercel',
image: 'Vercel',
isAvailable: false,
isAvailable: true,
type: 'vercel',
clientId: '',
clientSlug: CLIENT_SLUG_VERCEL,
Expand All @@ -58,7 +58,7 @@ const INTEGRATION_OPTIONS = [
name: 'Netlify',
slug: 'netlify',
image: 'Netlify',
isAvailable: false,
isAvailable: true,
type: 'oauth2',
clientId: CLIENT_ID_NETLIFY,
docsLink: ''
Expand All @@ -67,7 +67,7 @@ const INTEGRATION_OPTIONS = [
name: 'GitHub',
slug: 'github',
image: 'GitHub',
isAvailable: false,
isAvailable: true,
type: 'oauth2',
clientId: CLIENT_ID_GITHUB,
docsLink: ''
Expand Down
Loading

0 comments on commit acaae0b

Please sign in to comment.