Skip to content

LG-14425: update s3 bucket name #11462

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

Merged
MrNagoo merged 2 commits into from
Nov 6, 2024
Merged

LG-14425: update s3 bucket name #11462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46da1f5
update s3 bucket name
MrNagoo Nov 6, 2024
2f93a9b
changelog: Internal, Reporting, S3 Bucket Name change
MrNagoo Nov 6, 2024
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 app/jobs/data_warehouse/daily_sensitive_column_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def generate_column_data(columns, table)
end

def bucket_name
bucket_name = IdentityConfig.store.s3_idp_internal_dw_tasks
bucket_name = IdentityConfig.store.s3_idp_dw_tasks
env = Identity::Hostdata.env
aws_account_id = Identity::Hostdata.aws_account_id
aws_region = Identity::Hostdata.aws_region
Expand Down
2 changes: 1 addition & 1 deletion config/application.yml.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ ruby_workers_idv_enabled: true
rules_of_use_horizon_years: 5
rules_of_use_updated_at: '2022-01-19T00:00:00Z' # Production has a newer timestamp than this, update directly in S3
s3_data_warehouse_bucket_prefix: 'login-gov-analytics-export'
s3_idp_internal_dw_tasks: 'login-gov-idp-internal-dw-tasks'
s3_idp_dw_tasks: 'login-gov-idp-dw-tasks'
s3_public_reports_enabled: false
s3_report_bucket_prefix: login-gov.reports
s3_report_public_bucket_prefix: login-gov-pubdata
Expand Down
2 changes: 1 addition & 1 deletion lib/identity_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def self.store
config.add(:s3_report_bucket_prefix, type: :string)
config.add(:s3_report_public_bucket_prefix, type: :string)
config.add(:s3_data_warehouse_bucket_prefix, type: :string)
config.add(:s3_idp_internal_dw_tasks, type: :string)
config.add(:s3_idp_dw_tasks, type: :string)
config.add(:s3_reports_enabled, type: :boolean)
config.add(:saml_endpoint_configs, type: :json, options: { symbolize_names: true })
config.add(:saml_secret_rotation_enabled, type: :boolean)
Expand Down
10 changes: 5 additions & 5 deletions spec/jobs/data_warehouse/daily_sensitive_column_report_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

let(:timestamp) { Date.new(2024, 10, 15).in_time_zone('UTC') }
let(:job) { described_class.new }
let(:expected_bucket) { 'login-gov-ipd-internal-dw-tasks-test-1234-us-west-2' }
let(:expected_bucket) { 'login-gov-ipd-dw-tasks-test-1234-us-west-2' }
let(:tables) { ['auth_app_configurations'] }
let(:s3_idp_internal_dw_tasks) { 'login-gov-idp-internal-dw-tasks' }
let(:s3_idp_dw_tasks) { 'login-gov-idp-dw-tasks' }

let(:expected_json) do
{
Expand Down Expand Up @@ -58,16 +58,16 @@
{
body: anything,
content_type: 'application/json',
bucket: 'login-gov-idp-internal-dw-tasks-int-1234-us-west-1',
bucket: 'login-gov-idp-dw-tasks-int-1234-us-west-1',
}
end

before do
allow(Identity::Hostdata).to receive(:env).and_return('int')
allow(Identity::Hostdata).to receive(:aws_account_id).and_return('1234')
allow(Identity::Hostdata).to receive(:aws_region).and_return('us-west-1')
allow(IdentityConfig.store).to receive(:s3_idp_internal_dw_tasks).
and_return(s3_idp_internal_dw_tasks)
allow(IdentityConfig.store).to receive(:s3_idp_dw_tasks).
and_return(s3_idp_dw_tasks)

Aws.config[:s3] = {
stub_responses: {
Expand Down