Skip to content

Commit

Permalink
chore: create separate staging_ and production_ columns in `team_…
Browse files Browse the repository at this point in the history
…integrations` for Power Automate File API keys (#3061)
  • Loading branch information
jessicamcinchak authored Apr 26, 2024
1 parent 040d257 commit a33754c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
3 changes: 2 additions & 1 deletion hasura.planx.uk/metadata/tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1421,9 +1421,10 @@
columns:
- id
- team_id
- power_automate_api_key
- production_bops_submission_url
- staging_bops_submission_url
- production_power_automate_api_key
- staging_power_automate_api_key
- has_planning_data
- production_file_api_key
- staging_file_api_key
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
alter table "public"."team_integrations" rename column "staging_power_automate_api_key" to "power_automate_api_key";
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
alter table "public"."team_integrations" rename column "power_automate_api_key" to "staging_power_automate_api_key";
comment on column "public"."team_integrations"."staging_power_automate_api_key" is E'API key used to make authorised requests to the Power Automate Webhook URL stored in the format <API_KEY>:<INITIALIZATION_VECTOR>';

alter table "public"."team_integrations" add column "production_power_automate_api_key" text null;
comment on column "public"."team_integrations"."production_power_automate_api_key" is E'API key used to make authorised requests to the Power Automate Webhook URL stored in the format <API_KEY>:<INITIALIZATION_VECTOR>';
2 changes: 1 addition & 1 deletion scripts/seed-database/container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ done

# Copy subset of team_integrations columns
# Do not copy production values
psql --quiet ${REMOTE_PG} --command="\\copy (SELECT id, team_id, staging_bops_submission_url, staging_bops_secret, has_planning_data, staging_govpay_secret, staging_file_api_key, power_automate_webhook_url, power_automate_api_key FROM team_integrations) TO '/tmp/team_integrations.csv' (FORMAT csv, DELIMITER ';');"
psql --quiet ${REMOTE_PG} --command="\\copy (SELECT id, team_id, staging_bops_submission_url, staging_bops_secret, has_planning_data, staging_govpay_secret, staging_file_api_key, power_automate_webhook_url, staging_power_automate_api_key FROM team_integrations) TO '/tmp/team_integrations.csv' (FORMAT csv, DELIMITER ';');"
echo team_integrations downloaded

psql --quiet ${REMOTE_PG} --command="\\copy (SELECT DISTINCT ON (flow_id) id, data, flow_id, summary, publisher_id, created_at FROM published_flows ORDER BY flow_id, created_at DESC) TO '/tmp/published_flows.csv' (FORMAT csv, DELIMITER ';');"
Expand Down
8 changes: 4 additions & 4 deletions scripts/seed-database/write/team_integrations.sql
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ CREATE TEMPORARY TABLE sync_team_integrations (
staging_govpay_secret text,
staging_file_api_key text,
power_automate_webhook_url text,
power_automate_api_key text
staging_power_automate_api_key text
);

\COPY sync_team_integrations FROM '/tmp/team_integrations.csv' WITH (FORMAT csv, DELIMITER ';');

INSERT INTO
team_integrations (id, team_id, staging_bops_submission_url, staging_bops_secret, has_planning_data, staging_govpay_secret, staging_file_api_key, power_automate_webhook_url, power_automate_api_key)
team_integrations (id, team_id, staging_bops_submission_url, staging_bops_secret, has_planning_data, staging_govpay_secret, staging_file_api_key, power_automate_webhook_url, staging_power_automate_api_key)
SELECT
id,
team_id,
Expand All @@ -24,7 +24,7 @@ SELECT
staging_govpay_secret,
staging_file_api_key,
power_automate_webhook_url,
power_automate_api_key
staging_power_automate_api_key
FROM
sync_team_integrations ON CONFLICT (id) DO
UPDATE
Expand All @@ -36,7 +36,7 @@ SET
staging_govpay_secret = EXCLUDED.staging_govpay_secret,
staging_file_api_key = EXCLUDED.staging_file_api_key,
power_automate_webhook_url = EXCLUDED.power_automate_webhook_url,
power_automate_api_key = EXCLUDED.power_automate_api_key;
staging_power_automate_api_key = EXCLUDED.staging_power_automate_api_key;
SELECT
setval('team_integrations_id_seq', max(id))
FROM
Expand Down

0 comments on commit a33754c

Please sign in to comment.