Skip to content

Commit fd56556

Browse files
edmundmillerclaude
andcommitted
fix(pulumi): resolve 1Password config conflict and S3 deprecation warnings
- Add account="" to 1Password provider to prevent CLI account detection conflict - Refactor S3 bucket to use separate BucketServerSideEncryptionConfigurationV2 resource - Refactor S3 bucket to use separate BucketVersioningV2 resource - Remove deprecated inline server_side_encryption_configuration parameter - Remove deprecated inline versioning parameter Fixes "Config conflict: serviceAccountToken and account are set" error by explicitly disabling account detection when using service account tokens. Resolves AWS deprecation warnings by moving encryption and versioning configuration to dedicated resources as recommended by AWS provider. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 57ecf91 commit fd56556

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

pulumi/co2_reports/Pulumi.AWSMegatests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ encryptionsalt: v1:Dd5GnLRGGJQ=:v1:HWX/n0HL3VxDJrWR:ouykGXCccBLXFd6kAKWW0uHByWK/
22
config:
33
aws:region: eu-north-1
44
github:owner: nf-core
5+
pulumi-onepassword:service_account_token:
6+
secure: v1:/9UqNK7J/BSgkoof:PLSCC8wOdrIkvfK0pdodnyOid/HSwFb5Ra6+x0zVOiN+1ZbulPub0T1tRTdyCG4yqJa8dvcnS62kPRu9CCm10tPu+/g0HCVhUaR8DLB5lO5HtWn/OA28xd7OluDhp5e2JRYFV7HWUpnfTV9rlwpxntWAaCnnsSIw53yyiQLl0cMnf/V51VOo+e2YkqZJg/fyPtpeVS28FRZvjxFUIV5nxtaCw7K/5kXhtJOf6ZR160sH9bkkhNzzqQQ53JLY02rgFqBLAQ5dPRZMH6cB6HJiznq/zgEo2331/M6+TCqzyCi1spIvfhC7i3GV1KtVNaKJSD8tVEcscHJHR4hFElsJ5yHVVT/BWYL/A/4QjktY/hRKheDeLbQfkL5zQzbpm8DkNEwBv/x+691uhAJy387nK8+MdACLjT4w5Z7kmn4S+LOi8bPIXvTdpsWdijwT9Rbv4rr7p25nhoB4T+/ikDXWGSW/Lj5eVgcKVZ8KcY2MhhYGQ/LItWvrPO4K3kjZnglOjzU3CX5wuCrki4uHhKGgpWT+/XTgSe4nerp9iFZPs42yneEMz1icYfPkXOybDuV+4TPB2rn7g1Yp1k2+1ILe8aw82Pzw2DEDcFjyVTTHsCytBGKFlOT/MxWmgiY8BCJvEBLzOrDPHqfWFTeyIVdVw62nnFMZwVoDxl68aCGbAWCsBr2sS3uTZAak7RP5cXYa9zEIb6d4dQ6PiUl/V6q4yi+yawde7F7St8qd+MTBvBgfieEXwzwwejb2IGmkI6uKD2mSOUk+Dyb4DymuuYatFf6QUlCQEBlyaLZmA1SIGSMrASKmY54VffU6C4LLZvQc8Sxa20wzuYIQ+RO/o2EGQ2Kq9b2teOVMah6kWHVFrNA46+3cNmUSMXxuoiyjsQo0KMzWY8ZpJ2qXDhCJLYdlsVKY4W3i2rS4smjGbHxpnhC6sUgH3LaJBZFHWk+OGAI35y1AVocquUzipCsJGrMD9SiZla6mOKD9Cwv3kdRQQFbSdmH1hF829lBk6o+uXrhpfxHiyD+GgsuVLTzpOTiZigehafUx22ALfrGmF28vK+uxU4rc0DYsJMzyE+/bmmIzyE6H8NRsCbaYp5XyAUCMm4jq+MoZrR0bPde96yGNNwPP/xEasIOu5S/+QoVCQN8BkeArIGY8T3M=

pulumi/co2_reports/__main__.py

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
onepassword_provider = onepassword.Provider(
1717
"onepassword-provider",
1818
service_account_token=onepassword_config.require_secret("service_account_token"),
19+
account="", # Explicitly disable CLI account detection to avoid conflicts
1920
)
2021

2122
# Get GitHub token from 1Password
@@ -39,15 +40,29 @@
3940
co2_reports_bucket = aws.s3.Bucket(
4041
"co2-reports-bucket",
4142
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(
4553
sse_algorithm="AES256",
4654
),
4755
),
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",
5166
),
5267
opts=pulumi.ResourceOptions(provider=aws_provider),
5368
)

0 commit comments

Comments
 (0)