Skip to content

Commit 4c20f62

Browse files
Dba 813 licence (#472)
* Bash shell * acl parameter * Test acl * Test acl with setup environments * Add acl for weblogic file upload to s3 * Add stage mis dev environment * Add acl for zip file upload to s3
1 parent 9ba3f79 commit 4c20f62

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/oracle-db-licence-audit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ jobs:
3333
fail-fast: false
3434
max-parallel: 1
3535
matrix:
36-
environment: [delius-core-dev,delius-core-test,delius-mis-dev]
37-
#,delius-core-training,delius-core-stage,delius-core-preprod,delius-core-prod,delius-mis-stage,delius-mis-preprod,delius-mis-prod
36+
environment: [delius-core-dev,delius-mis-dev,delius-core-test,delius-core-stage,delius-mis-stage]
3837
environment: ${{ matrix.environment }}-preapproved
3938
timeout-minutes: 1440
4039
continue-on-error: true
@@ -68,6 +67,7 @@ jobs:
6867
- name: Get Database Targets For Environment
6968
id: databasetargets
7069
working-directory: ${{ env.inventory }}
70+
shell: bash
7171
run: |
7272
targets=""
7373
prefix="environment_name_$(echo ${{ matrix.environment }} | sed 's/dev/development_dev/;s/test/test_test/;s/training/test_training/;s/stage/preproduction_stage/;s/pre-prod/preproduction_pre_prod/;s/-prod/_production_prod/;s/-/_/g')"

playbooks/oracle_licence_audit/audit/tasks/audit-database.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@
8383
become: no
8484
shell: |
8585
export PATH=$PATH:/usr/local/bin
86-
aws s3 cp {{ audit_dir }} s3://{{ dependencies_bucket.name }}/{{ audit_output }} --recursive --exclude "*" --include "*-db-*" {{ general_kms_key_option }}
86+
aws s3 cp {{ audit_dir }} s3://{{ dependencies_bucket.name }}/{{ audit_output }} --recursive --acl bucket-owner-full-control --exclude "*" --include "*-db-*" {{ general_kms_key_option }}

playbooks/oracle_licence_audit/audit/tasks/audit-upload.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- name: Upload to s3 bucket the zip file
1515
delegate_to: localhost
1616
become: no
17-
shell: aws s3 cp {{ audit_dir }}/{{ ansible_date_time.date }}/{{ audit_zip_file }} s3://{{ dependencies_bucket.name }}/{{ audit_output }}/{{ audit_zip_file }} {{ general_kms_key_option }}
17+
shell: aws s3 cp {{ audit_dir }}/{{ ansible_date_time.date }}/{{ audit_zip_file }} s3://{{ dependencies_bucket.name }}/{{ audit_output }}/{{ audit_zip_file }} --acl bucket-owner-full-control {{ general_kms_key_option }}
1818

1919
- name: INFORMATION
2020
debug:

playbooks/oracle_licence_audit/audit/tasks/audit-weblogic.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@
106106
become: no
107107
shell: |
108108
export PATH=$PATH:/usr/local/bin
109-
aws s3 cp {{ weblogic_output }} s3://{{ dependencies_bucket.name }}/{{ audit_output }}/ {{ general_kms_key_option }}
109+
aws s3 cp {{ weblogic_output }} s3://{{ dependencies_bucket.name }}/{{ audit_output }}/ --acl bucket-owner-full-control {{ general_kms_key_option }}

0 commit comments

Comments
 (0)