Console api changed

pkg/database/queries/metabase_metadata.sql

@@ -72,4 +72,4 @@ WITH sources_in_same_dataset AS (
 SELECT table_name FROM sources_in_same_dataset sds
 JOIN metabase_metadata mbm
 ON mbm.dataset_id = sds.dataset_id
-WHERE mbm.collection_id IS null;
+WHERE mbm.permission_group_id = 0;

pkg/nc/nc.go

@@ -21,9 +21,17 @@ type Client struct {
 }
 
 type Team struct {
-	Slug             string        `json:"slug"`
-	GoogleGroupEmail string        `json:"googleGroupEmail"`
-	Environments     []Environment `json:"environments"`
+	Slug              string            `json:"slug"`
+	ExternalResources ExternalResources `json:"externalResources"`
+	Environments      []Environment     `json:"environments"`
+}
+
+type ExternalResources struct {
+	GoogleGroup GoogleGroup `json:"googleGroup"`
+}
+
+type GoogleGroup struct {
+	Email string `json:"email"`
 }
 
 type Environment struct {
@@ -45,7 +53,8 @@ type Teams struct {
 }
 
 type PageInfo struct {
-	HasNextPage bool `json:"hasNextPage"`
+	HasNextPage bool    `json:"hasNextPage"`
+	EndCursor   *string `json:"endCursor"`
 }
 
 type TeamOutput struct {
@@ -55,40 +64,45 @@ type TeamOutput struct {
 
 func (c *Client) GetTeamGoogleProjects(ctx context.Context) (map[string]TeamOutput, error) {
 	gqlQuery := `
-		query GCPTeams($limit: Int, $offset: Int){
-			teams(limit: $limit, offset: $offset) {
+		query GCPTeams($first: Int, $after: Cursor){
+			teams(first: $first, after: $after){
 				nodes {
 					slug
-					googleGroupEmail
+					externalResources {
+						googleGroup {
+							email
+						}
+					}
 					environments {
 						name
 						gcpProjectID
 					}
 				}
 				pageInfo {
 					hasNextPage
+					endCursor
 				}
 			}
 		}
 	`
 
 	const limit = 100
-	offset := 0
+	var offset *string
 
 	mapping := map[string]TeamOutput{}
 
 	for {
+		r := Response{}
+
 		payload := map[string]any{
 			"query": gqlQuery,
 			"variables": map[string]any{
-				"limit":  limit,
-				"offset": offset,
+				"first": limit,
+				"after": offset,
 			},
 		}
 
-		r := Response{}
-
-		err := c.sendRequestAndDeserialize(ctx, http.MethodPost, "/query", payload, &r)
+		err := c.sendRequestAndDeserialize(ctx, http.MethodPost, "/graphql", payload, &r)
 		if err != nil {
 			return nil, fmt.Errorf("fetching team google projects: %w", err)
 		}
@@ -97,7 +111,7 @@ func (c *Client) GetTeamGoogleProjects(ctx context.Context) (map[string]TeamOutp
 			for _, env := range team.Environments {
 				if env.Name == c.naisClusterName {
 					mapping[team.Slug] = TeamOutput{
-						GroupEmail:   team.GoogleGroupEmail,
+						GroupEmail:   team.ExternalResources.GoogleGroup.Email,
 						GCPProjectID: env.GcpProjectID,
 					}
 				}
@@ -108,7 +122,7 @@ func (c *Client) GetTeamGoogleProjects(ctx context.Context) (map[string]TeamOutp
 			break
 		}
 
-		offset += limit
+		offset = r.Data.Teams.PageInfo.EndCursor
 	}
 
 	return mapping, nil

pkg/nc/nc_test.go

@@ -28,8 +28,12 @@ func TestClient_GetTeamGoogleProjects(t *testing.T) {
 					Teams: nc.Teams{
 						Nodes: []nc.Team{
 							{
-								Slug:             "team-1",
-								GoogleGroupEmail: "team-1@nav.no",
+								Slug: "team-1",
+								ExternalResources: nc.ExternalResources{
+									GoogleGroup: nc.GoogleGroup{
+										Email: "team-1@nav.no",
+									},
+								},
 								Environments: []nc.Environment{
 									{
 										Name:         "env-1",
@@ -38,8 +42,12 @@ func TestClient_GetTeamGoogleProjects(t *testing.T) {
 								},
 							},
 							{
-								Slug:             "team-2",
-								GoogleGroupEmail: "team-1@nav.no",
+								Slug: "team-2",
+								ExternalResources: nc.ExternalResources{
+									GoogleGroup: nc.GoogleGroup{
+										Email: "team-1@nav.no",
+									},
+								},
 								Environments: []nc.Environment{
 									{
 										Name:         "env-2",
@@ -69,8 +77,12 @@ func TestClient_GetTeamGoogleProjects(t *testing.T) {
 					Teams: nc.Teams{
 						Nodes: []nc.Team{
 							{
-								Slug:             "team-1",
-								GoogleGroupEmail: "team-1@nav.no",
+								Slug: "team-1",
+								ExternalResources: nc.ExternalResources{
+									GoogleGroup: nc.GoogleGroup{
+										Email: "team-1@nav.no",
+									},
+								},
 								Environments: []nc.Environment{
 									{
 										Name:         "env-2",
@@ -94,7 +106,7 @@ func TestClient_GetTeamGoogleProjects(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				assert.Equal(t, "/query", r.URL.Path)
+				assert.Equal(t, "/graphql", r.URL.Path)
 				assert.Equal(t, "Bearer super-secret", r.Header.Get("Authorization"))
 				assert.Equal(t, http.MethodPost, r.Method)
 

pkg/service/core/service_metabase.go

@@ -925,7 +925,7 @@ func (s *metabaseService) SyncTableVisibility(ctx context.Context, meta *service
 }
 
 func isRestrictedDatabase(meta *service.MetabaseMetadata) bool {
-	if meta.CollectionID != nil && *meta.CollectionID != 0 {
+	if meta.PermissionGroupID != nil && *meta.PermissionGroupID != 0 {
 		return true
 	}