Skip to content

Commit

Permalink
Populate project_id field on rule_instances (#3579)
Browse files Browse the repository at this point in the history
Also sets project_id as not null
  • Loading branch information
dmjb authored Jun 13, 2024
1 parent 6ddc76e commit 4907092
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- Copyright 2024 Stacklok, Inc
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.

ALTER TABLE rule_instances ALTER COLUMN project_id DROP NOT NULL;
26 changes: 26 additions & 0 deletions database/migrations/000068_rule_instance_project_id_migrate.up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
-- Copyright 2024 Stacklok, Inc
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.

BEGIN;

-- populate by joining on profiles table
UPDATE rule_instances AS ri
SET project_id = pf.project_id
FROM profiles AS pf
WHERE ri.profile_id = pf.id;

-- now we can add the not null constraint
ALTER TABLE rule_instances ALTER COLUMN project_id SET NOT NULL;

COMMIT;
2 changes: 1 addition & 1 deletion internal/db/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/db/rule_instances.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions internal/profiles/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -778,10 +778,7 @@ func upsertRuleInstances(
id, err := qtx.UpsertRuleInstance(ctx, db.UpsertRuleInstanceParams{
ProfileID: profileID,
// TODO: Make non nullable in future PR
ProjectID: uuid.NullUUID{
UUID: projectID,
Valid: true,
},
ProjectID: projectID,
RuleTypeID: entityRuleTuple.RuleID,
Name: rule.Name,
EntityType: entityType,
Expand Down

0 comments on commit 4907092

Please sign in to comment.