Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Create Environment workflow issues #2988

Merged
merged 4 commits into from
Feb 16, 2025
+9 −9
Merged

Fix Create Environment workflow issues #2988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4cbd02
update action logic [skip actions]
gurevichdmitry Feb 4, 2025
5c85170
update action
gurevichdmitry Feb 10, 2025
b407519
Merge branch 'main' into dg-fix-test-env-wf
gurevichdmitry Feb 13, 2025
ba19e94
Merge branch 'main' into dg-fix-test-env-wf
gurevichdmitry Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/cdr/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ runs:
env:
AZURE_TAGS: ${{ inputs.azure-tags }}
DEPLOYMENT_NAME: "${{ inputs.deployment-name }}-inventory"
run: ./install_agent_az_cli.sh
run: DEPLOYMENT_NAME="$DEPLOYMENT_NAME-$(openssl rand -hex 3)" ./install_agent_az_cli.sh

- name: Install AWS Asset Inventory integration
id: aws-asset-inventory
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/cis-agent-based/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ runs:
shell: bash
env:
AZURE_TAGS: "${{ inputs.cspm-azure-tags }}"
run: ./install_agent_az_cli.sh
run: DEPLOYMENT_NAME="$DEPLOYMENT_NAME-$(openssl rand -hex 3)" ./install_agent_az_cli.sh

- name: Install D4C integration
id: kspm-d4c
if: ${{ !cancelled() && startsWith(env.STACK_VERSION, '8') && inputs.serverless_mode == 'false' && steps.deploy-cis-infra.outcome == 'success' }}
if: ${{ !cancelled() && startsWith(env.STACK_VERSION, '8') && inputs.serverless-mode == 'false' && steps.deploy-cis-infra.outcome == 'success' }}
working-directory: tests/integrations_setup
shell: bash
env:
Expand Down
12 changes: 6 additions & 6 deletions deploy/test-environments/cis/output.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@ output "deployment_name" {
# EC2 output
# ============================================================
output "ec2_kspm_ssh_cmd" {
value = module.aws_ec2_for_kspm[0].cloudbeat_ssh_cmd
value = var.deploy_aws_kspm ? module.aws_ec2_for_kspm[0].cloudbeat_ssh_cmd : null
sensitive = true
}

output "ec2_kspm_public_ip" {
value = module.aws_ec2_for_kspm[0].aws_instance_cloudbeat_public_ip
value = var.deploy_aws_kspm ? module.aws_ec2_for_kspm[0].aws_instance_cloudbeat_public_ip : null
sensitive = true
}

output "ec2_kspm_key" {
value = module.aws_ec2_for_kspm[0].ec2_ssh_key
value = var.deploy_aws_kspm ? module.aws_ec2_for_kspm[0].ec2_ssh_key : null
sensitive = true
}

output "ec2_cspm_ssh_cmd" {
value = module.aws_ec2_for_cspm[0].cloudbeat_ssh_cmd
value = var.deploy_aws_cspm ? module.aws_ec2_for_cspm[0].cloudbeat_ssh_cmd : null
sensitive = true
}

output "ec2_cspm_public_ip" {
value = module.aws_ec2_for_cspm[0].aws_instance_cloudbeat_public_ip
value = var.deploy_aws_cspm ? module.aws_ec2_for_cspm[0].aws_instance_cloudbeat_public_ip : null
sensitive = true
}

output "ec2_cspm_key" {
value = module.aws_ec2_for_cspm[0].ec2_ssh_key
value = var.deploy_aws_cspm ? module.aws_ec2_for_cspm[0].ec2_ssh_key : null
sensitive = true
}

Expand Down