From db163852647fa798d92736ae7e51a87d575a3974 Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Thu, 6 Nov 2025 21:08:03 +0000
Subject: [PATCH] planet: Use aws ids from databag

---
 cookbooks/planet/recipes/aws.rb                        | 3 ++-
 cookbooks/planet/templates/default/aws-credentials.erb | 8 ++++----
 test/data_bags/planet/aws.json                         | 5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cookbooks/planet/recipes/aws.rb b/cookbooks/planet/recipes/aws.rb
index cd4444690..66e89236d 100644
--- a/cookbooks/planet/recipes/aws.rb
+++ b/cookbooks/planet/recipes/aws.rb
@@ -40,5 +40,6 @@ template "/home/planet/.aws/credentials" do
   owner "planet"
   group "planet"
   mode "0600"
-  variables :credentials => aws_credentials
+  variables :aws_credentials => aws_credentials
+  sensitive true
 end
diff --git a/cookbooks/planet/templates/default/aws-credentials.erb b/cookbooks/planet/templates/default/aws-credentials.erb
index 2475b9a91..52699548a 100644
--- a/cookbooks/planet/templates/default/aws-credentials.erb
+++ b/cookbooks/planet/templates/default/aws-credentials.erb
@@ -1,14 +1,14 @@
 [osm-pds]
-aws_access_key_id = AKIAZFVRMSDZE2DANIFS
-aws_secret_access_key = <%= @credentials["osm-pds"] %>
+aws_access_key_id = "<%= @aws_credentials[pds_access_key_id] %>"
+aws_secret_access_key = "<%= @aws_credentials[pds_secret_access_key] %>"
 
 [osm-pds-upload]
 role_arn=arn:aws:iam::630658470130:role/osm-pds-upload-role
 source_profile=osm-pds
 
 [osm-osmdbt-state]
-aws_access_key_id = AKIASQUXHPE7BNEKJFRQ
-aws_secret_access_key = <%= @credentials["osm-osmdbt-state"] %>
+aws_access_key_id = "<%= @aws_credentials[osmdbt_access_key_id] %>"
+aws_secret_access_key = "<%= @aws_credentials[osmdbt_secret_access_key] %>"
 
 [osm-osmdbt-state-upload]
 role_arn=arn:aws:iam::173189593406:role/osm-osmdbt-state-upload-role
diff --git a/test/data_bags/planet/aws.json b/test/data_bags/planet/aws.json
index 787bf1c54..73e3abcbb 100644
--- a/test/data_bags/planet/aws.json
+++ b/test/data_bags/planet/aws.json
@@ -1,4 +1,7 @@
 {
   "id": "aws",
-  "osm-pds": "osm-pds"
+  "pds_access_key_id": "AKIPDSACCESSKEYIDEXAMPLE",
+  "pds_secret_access_key": "pds-secret-access-key-example",
+  "osmdbt_access_key_id": "AKIOSMDBTACCESSKEYIDEXAMPLE",
+  "osmdbt_secret_access_key": "osmdbt-secret-access-key-example"
 }
-- 
2.39.5