Skip to content

Commit

Permalink
Revert test
Browse files Browse the repository at this point in the history
Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
  • Loading branch information
gaiksaya committed Dec 6, 2024
1 parent db77ff0 commit ee89130
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 deletions.
32 changes: 16 additions & 16 deletions lib/ci-stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,32 @@ import { JenkinsWAF } from './security/waf';
import { FineGrainedAccessSpecs } from './compute/auth-config';

export interface CIStackProps extends StackProps {
/** Additional logic that needs to be run on Master Node. The value has to be path to a file */
readonly additionalCommands?: string;
/** Users with admin access during initial deployment */
readonly adminUsers?: string[];
/** IAM role ARN to be assumed by jenkins agent nodes eg: cross-account */
readonly agentAssumeRole?: string[];
/** Should the Jenkins use https */
readonly useSsl?: boolean;
/** Type of login mechanism to adopt */
readonly authType?: string;
/** Fine grain access control specifications */
readonly fineGrainedAccessSpecs?: FineGrainedAccessSpecs[];
/** Restrict jenkins access to */
readonly restrictServerAccessTo?: IPeer;
/** Additional verification during deployment and resource startup. */
readonly ignoreResourcesFailures?: boolean;
/** Users with admin access during initial deployment */
readonly adminUsers?: string[];
/** Additional logic that needs to be run on Master Node. The value has to be path to a file */
readonly additionalCommands?: string;
/** Do you want to retain jenkins jobs and build history */
readonly dataRetention?: boolean;
/** Enable views on jenkins UI */
readonly enableViews?: boolean;
/** IAM role ARN to be assumed by jenkins agent nodes eg: cross-account */
readonly agentAssumeRole?: string[];
/** File path containing global environment variables to be added to jenkins enviornment */
readonly envVarsFilePath?: string;
/** Additional verification during deployment and resource startup. */
readonly ignoreResourcesFailures?: boolean;
/** Add Mac agent to jenkins */
readonly macAgent?: boolean;
/** Restrict jenkins access to */
readonly restrictServerAccessTo?: IPeer;
/** Enable views on jenkins UI */
readonly enableViews?: boolean;
/** Use Production Agents */
readonly useProdAgents?: boolean;
/** Should the Jenkins use https */
readonly useSsl?: boolean;
/** Fine grain access control specifications */
readonly fineGrainedAccessSpecs?: FineGrainedAccessSpecs[];
}

function getServerAccess(serverAccessType: string, restrictServerAccessTo: string): IPeer {
Expand Down
4 changes: 1 addition & 3 deletions lib/compute/auth-config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { dump } from 'js-yaml';
import { writeFileSync } from 'fs';

/**
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

export interface FineGrainedAccessSpecs {
users: string[],
roleName: string,
Expand Down

0 comments on commit ee89130

Please sign in to comment.