|
16 | 16 | onepassword_provider = onepassword.Provider( |
17 | 17 | "onepassword-provider", |
18 | 18 | service_account_token=onepassword_config.require_secret("service_account_token"), |
| 19 | + account="", # Explicitly disable CLI account detection to avoid conflicts |
19 | 20 | ) |
20 | 21 |
|
21 | 22 | # Get GitHub token from 1Password |
|
39 | 40 | co2_reports_bucket = aws.s3.Bucket( |
40 | 41 | "co2-reports-bucket", |
41 | 42 | bucket="nf-core-co2-reports", |
42 | | - server_side_encryption_configuration=aws.s3.BucketServerSideEncryptionConfigurationArgs( |
43 | | - rule=aws.s3.BucketServerSideEncryptionConfigurationRuleArgs( |
44 | | - apply_server_side_encryption_by_default=aws.s3.BucketServerSideEncryptionConfigurationRuleApplyServerSideEncryptionByDefaultArgs( |
| 43 | + opts=pulumi.ResourceOptions(provider=aws_provider), |
| 44 | +) |
| 45 | + |
| 46 | +# Configure server-side encryption for the bucket |
| 47 | +co2_reports_bucket_encryption = aws.s3.BucketServerSideEncryptionConfigurationV2( |
| 48 | + "co2-reports-bucket-encryption", |
| 49 | + bucket=co2_reports_bucket.id, |
| 50 | + rules=[ |
| 51 | + aws.s3.BucketServerSideEncryptionConfigurationV2RuleArgs( |
| 52 | + apply_server_side_encryption_by_default=aws.s3.BucketServerSideEncryptionConfigurationV2RuleApplyServerSideEncryptionByDefaultArgs( |
45 | 53 | sse_algorithm="AES256", |
46 | 54 | ), |
47 | 55 | ), |
48 | | - ), |
49 | | - versioning=aws.s3.BucketVersioningArgs( |
50 | | - enabled=True, |
| 56 | + ], |
| 57 | + opts=pulumi.ResourceOptions(provider=aws_provider), |
| 58 | +) |
| 59 | + |
| 60 | +# Enable versioning for the bucket |
| 61 | +co2_reports_bucket_versioning = aws.s3.BucketVersioningV2( |
| 62 | + "co2-reports-bucket-versioning", |
| 63 | + bucket=co2_reports_bucket.id, |
| 64 | + versioning_configuration=aws.s3.BucketVersioningV2VersioningConfigurationArgs( |
| 65 | + status="Enabled", |
51 | 66 | ), |
52 | 67 | opts=pulumi.ResourceOptions(provider=aws_provider), |
53 | 68 | ) |
|
0 commit comments