-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extend the Profile List database calls to include selectors
Since the profile selectors need to be included when listing profiles, we need to extend the two profile list calls to list selectors as well. Because the selectors are stored in a different table, but we still need to retrieve them in the same Go struct defined in models, we define a new SQL type in a migration that represents the selectors and tell sqlc to use it in sqlc.yaml. This new Go struct needs a Scan method as well to convert raw SQL rows into structs as well. Fixes: #3721 Co-authored-by: Michelangelo Mori <[email protected]>
- Loading branch information
Showing
7 changed files
with
308 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| -- 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; | ||
|
|
||
| DROP TYPE IF EXISTS profile_selector; | ||
|
|
||
| COMMIT; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| -- 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; | ||
|
|
||
| CREATE TYPE profile_selector AS ( | ||
| id UUID, | ||
| profile_id UUID, | ||
| entity entities, | ||
| selector TEXT, | ||
| comment TEXT | ||
| ); | ||
|
|
||
| COMMIT; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| // 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. | ||
|
|
||
| package db | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| ) | ||
|
|
||
| // Scan implements the sql.Scanner interface for the SelectorInfo struct | ||
| func (s *ProfileSelector) Scan(value interface{}) error { | ||
| if value == nil { | ||
| return nil | ||
| } | ||
|
|
||
| // Convert the value to a string | ||
| bytes, ok := value.([]byte) | ||
| if !ok { | ||
| return fmt.Errorf("failed to scan SelectorInfo: %v", value) | ||
| } | ||
| str := string(bytes) | ||
|
|
||
| // Remove the parentheses | ||
| str = strings.TrimPrefix(str, "(") | ||
| str = strings.TrimSuffix(str, ")") | ||
|
|
||
| // Split the string by commas to get the individual field values | ||
| parts := strings.Split(str, ",") | ||
|
|
||
| // Assign the values to the struct fields | ||
| if len(parts) != 5 { | ||
| return fmt.Errorf("failed to scan SelectorInfo: unexpected number of fields") | ||
| } | ||
|
|
||
| if err := s.ID.Scan(parts[0]); err != nil { | ||
| return fmt.Errorf("failed to scan id: %v", err) | ||
| } | ||
|
|
||
| if err := s.ProfileID.Scan(parts[1]); err != nil { | ||
| return fmt.Errorf("failed to scan profile_id: %v", err) | ||
| } | ||
|
|
||
| s.Entity = NullEntities{} | ||
| if parts[2] != "" { | ||
| if err := s.Entity.Scan(parts[2]); err != nil { | ||
| return fmt.Errorf("failed to scan entity: %v", err) | ||
| } | ||
| } | ||
|
|
||
| selector := strings.TrimPrefix(parts[3], "\"") | ||
| selector = strings.TrimSuffix(selector, "\"") | ||
| s.Selector = selector | ||
|
|
||
| s.Comment = parts[4] | ||
|
|
||
| return nil | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters