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

adjusting default s3 path to cid-data- prefix #717

Merged
merged 1 commit into from
Jan 17, 2024
+12 −12
Merged

adjusting default s3 path to cid-data- prefix #717

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
2 changes: 1 addition & 1 deletion cfn-templates/cid-cfn.tests.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ setup_file() {
QuickSightUser="$quicksight_user"\
CURBucketPath="s3://$cur_bucket/$cur_prefix/$cur_name/$cur_name"\
CURIsManagedByCloudFormation="yes"\
CostOptimizationDataCollectionBucketPath="s3://costoptimizationdata{account_id}"\
CostOptimizationDataCollectionBucketPath="s3://cid-data-{account_id}"\
DeployCUDOSDashboard="yes"\
DeployComputeOptimizerDashboard="no"\
DeployCostIntelligenceDashboard="yes"\
Expand Down
2 changes: 1 addition & 1 deletion cid/builtin/core/data/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ views:
File: tao/glue_table.json
parameters:
s3FolderPath:
default: 's3://costoptimizationdata{account_id}/trusted-advisor/trusted-advisor-data'
default: 's3://cid-data-{account_id}/trusted-advisor/trusted-advisor-data'
description: Trusted Advisor Organization View report S3 path
ta_org_view:
File: tao/ta_org_view.sql
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://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
--view-compute-optimizer-ebs-volume-lines-s3FolderPath 's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
--view-compute-optimizer-auto-scale-lines-s3FolderPath 's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
--view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://costoptimizationdata{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://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ec2_lambda' \
--view-compute-optimizer-ebs-volume-lines-s3FolderPath 's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_ebs_volume' \
--view-compute-optimizer-auto-scale-lines-s3FolderPath 's3://costoptimizationdata{account_id}/Compute_Optimizer/Compute_Optimizer_auto_scale' \
--view-compute-optimizer-ec2-instance-lines-s3FolderPath 's3://costoptimizationdata{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
4 changes: 2 additions & 2 deletions cid/test/bats/10-deploy-update-delete/ta-organizational-view.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
--athena-database 'optimization_data' \
--share-with-account \

--view-ta-organizational-view-reports-s3FolderPath "s3://costoptimizationdata$account_id/optics-data-collector/ta-data'"
--view-ta-organizational-view-reports-s3FolderPath "s3://cid-data-$account_id/optics-data-collector/ta-data'"

[ "$status" -eq 0 ]
}
Expand Down Expand Up @@ -41,7 +41,7 @@ account_id=$(aws sts get-caller-identity --query "Account" --output text )
@test "Update works" {
run cid-cmd -vv --yes update --force --recursive \
--dashboard-id ta-organizational-view \
--view-ta-organizational-view-reports-s3FolderPath "s3://costoptimizationdata$account_id)/optics-data-collector/ta-data"
--view-ta-organizational-view-reports-s3FolderPath "s3://cid-data-$account_id)/optics-data-collector/ta-data"

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