Skip to content

Fix production deployment: add missing S3 service binding #1933

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
rileyseaburg merged 6 commits into from
Dec 23, 2025
Merged

Fix production deployment: add missing S3 service binding #1933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adc4305
Fix cf-cli download URL to use direct GitHub release URL
rileyseaburg Dec 22, 2025
9ecb049
Fix cf-cli installation using APT repository instead of direct download
rileyseaburg Dec 22, 2025
f527d3b
Update .circleci/config.yml
rileyseaburg Dec 22, 2025
03fd10d
Update .circleci/config.yml
rileyseaburg Dec 22, 2025
324730f
Merge pull request #1932 from GSA/fix/cf-cli-apt-install
rileyseaburg Dec 22, 2025
6626b3f
Add missing touchpoints-s3-uploads service binding to manifest
rileyseaburg Dec 23, 2025
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
24 changes: 15 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,20 @@ jobs:
mkdir /tmp/test-results
TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)"

bundle exec rspec --format progress \
--format RspecJunitFormatter \
--out /tmp/test-results/rspec.xml \
--format progress \
$TEST_FILES
bundle exec rspec --format progress \
--format RspecJunitFormatter \
--out /tmp/test-results/rspec.xml \
--format progress \
$TEST_FILES
# Install Cloud Foundry cli (cf) before deploy step. cf is used to push to Cloud.gov
- run:
name: Install-cf-cli
command: |
curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&source=github'
sudo dpkg -i cf-cli_amd64.deb
sudo mkdir -p /etc/apt/trusted.gpg.d
sudo wget -q -O /etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key
echo "deb [signed-by=/etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
sudo apt-get update
sudo apt-get install -y cf8-cli
cf -v
# collect reports
- store_test_results:
Expand Down Expand Up @@ -180,8 +183,11 @@ jobs:
- run:
name: Install-cf-cli
command: |
curl -v -L -o cf-cli_amd64.deb 'https://packages.cloudfoundry.org/stable?release=debian64&source=github'
sudo dpkg -i cf-cli_amd64.deb
# Install Cloud Foundry CLI repository key using modern signed-by mechanism
Copy link

Copilot AI Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CF CLI installation in the cron_tasks job is missing the command to create the trusted GPG directory. The build job includes sudo mkdir -p /etc/apt/trusted.gpg.d at line 133, but the cron_tasks job does not. This could cause the installation to fail if the directory doesn't already exist in the cimg/base:2025.01 image. Consider adding this line for consistency and reliability.

Suggested change
# Install Cloud Foundry CLI repository key using modern signed-by mechanism
# Install Cloud Foundry CLI repository key using modern signed-by mechanism
sudo mkdir -p /etc/apt/trusted.gpg.d

Copilot uses AI. Check for mistakes.
sudo wget -q -O /etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key
echo "deb [signed-by=/etc/apt/trusted.gpg.d/cloudfoundry-cli.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
sudo apt-get update
sudo apt-get install -y cf8-cli
cf -v
- run:
name: Run CRON tasks
Expand Down
1 change: 1 addition & 0 deletions touchpoints.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ applications:
- touchpoints-redis-service
- touchpoints-prod-s3
- touchpoints-prod-deployer
- touchpoints-s3-uploads
routes:
- route: touchpoints.app.cloud.gov
Loading