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 co path #778

Merged
merged 1 commit into from
Apr 8, 2024
Merged

fix co path #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions cid/builtin/core/data/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,31 +542,31 @@ views:
File: co/ec2_instance.json
parameters:
s3FolderPath:
default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_ec2_instance'
default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ec2_instance'
description: Compute Optimiser EC2 report S3 path

compute_optimizer_auto_scale_lines:
type: Glue_Table
File: co/auto_scale.json
parameters:
s3FolderPath:
default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_auto_scale'
default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_auto_scale'
description: Compute Optimiser auto_scale report S3 path

compute_optimizer_ebs_volume_lines:
type: Glue_Table
File: co/ebs_volume.json
parameters:
s3FolderPath:
default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_ebs_volume'
default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ebs_volume'
description: Compute Optimiser EBS report S3 path

compute_optimizer_lambda_lines:
type: Glue_Table
File: co/lambda.json
parameters:
s3FolderPath:
default: 's3://costoptimizationdata{account_id}/compute_optimizer/compute_optimizer_lambda'
default: 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_lambda'
description: Compute Optimiser Lambda report S3 path

compute_optimizer_ec2_instance_options:
Expand Down
16 changes: 8 additions & 8 deletions cid/test/bats/10-deploy-update-delete/compute-optimizer-dashboard.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
--dashboard-id compute-optimizer-dashboard \
--share-with-account \
--athena-database 'optimization_data' \
--view-compute-optimizer-lambda-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
--view-compute-optimizer-ebs-volume-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
--view-compute-optimizer-auto-scale-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
--view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_instance'
--view-compute-optimizer-lambda-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ec2_lambda' \
--view-compute-optimizer-ebs-volume-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ebs_volume' \
--view-compute-optimizer-auto-scale-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_auto_scale' \
--view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ec2_instance'

[ "$status" -eq 0 ]
}
Expand Down Expand Up @@ -43,10 +43,10 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
@test "Update works" {
run cid-cmd -vv --yes update --force --recursive \
--dashboard-id compute-optimizer-dashboard \
--view-compute-optimizer-lambda-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
--view-compute-optimizer-ebs-volume-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
--view-compute-optimizer-auto-scale-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
--view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://cid-data-{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_instance'
--view-compute-optimizer-lambda-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ec2_lambda' \
--view-compute-optimizer-ebs-volume-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ebs_volume' \
--view-compute-optimizer-auto-scale-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_auto_scale' \
--view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://cid-data-{account_id}/compute_optimizer/compute_optimizer_ec2_instance'

[ "$status" -eq 0 ]
echo "$output" | grep 'Update completed'
Expand Down
Loading