From 55d34856f716206535b3b0dc345eadf07097a1ba Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 23 Oct 2024 12:06:42 +0100 Subject: [PATCH] Remove unused googleurl package --- pkg/googleurl/parser.go | 106 ----------------------------------- pkg/googleurl/parser_test.go | 97 -------------------------------- 2 files changed, 203 deletions(-) delete mode 100644 pkg/googleurl/parser.go delete mode 100644 pkg/googleurl/parser_test.go diff --git a/pkg/googleurl/parser.go b/pkg/googleurl/parser.go deleted file mode 100644 index 4c9b48e4..00000000 --- a/pkg/googleurl/parser.go +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2022 The kpt and Nephio Authors -// -// 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 googleurl - -import ( - "fmt" - "net/url" - "strings" -) - -// Link holds the results of parsing a google selfLink URL. -type Link struct { - // Service is the service name e.g. container.googleapis.com - Service string - // Version is the version in the link - Version string - - // Project is the GCP project ID in the link - Project string - - // Zone is the GCP zone found in the link - Zone string - - // Location is the GCP location (region or zone) found in the link - Location string - - // Extra holds any additional named fields found in the link - Extra map[string]string -} - -// Parse parses the selfLink into fields in a Link object. -// A selfLink is expected to have a version as the first path token, otherwise use ParseUnversioned. -func Parse(selfLink string) (*Link, error) { - u, err := url.Parse(selfLink) - if err != nil { - return nil, fmt.Errorf("selfLink %q was not a valid URL", selfLink) - } - - link := &Link{ - Service: u.Host, - } - - tokens := strings.Split(strings.TrimPrefix(u.Path, "/"), "/") - - link.Version = tokens[0] - tokens = tokens[1:] - - if len(tokens)%2 != 0 { - return nil, fmt.Errorf("unexpected url %q (unexpected tokens)", selfLink) - } - - return parseTokens(link, tokens) -} - -func parseTokens(link *Link, tokens []string) (*Link, error) { - for i := 0; i < len(tokens); i += 2 { - switch tokens[i] { - case "projects": - link.Project = tokens[i+1] - case "zones": - link.Zone = tokens[i+1] - case "locations": - link.Location = tokens[i+1] - default: - if link.Extra == nil { - link.Extra = make(map[string]string) - } - link.Extra[tokens[i]] = tokens[i+1] - } - } - return link, nil -} - -// ParseUnversioned parses the unversioned selfLink into fields in a Link object. -// An unversioned reference differs from a normal selfLink in that it doesn't have a version, -// for example "//container.googleapis.com/projects/example-project/locations/us-central1/clusters/example-cluster" -func ParseUnversioned(selfLink string) (*Link, error) { - u, err := url.Parse(selfLink) - if err != nil { - return nil, fmt.Errorf("selfLink %q was not a valid URL", selfLink) - } - - link := &Link{ - Service: u.Host, - } - - tokens := strings.Split(strings.TrimPrefix(u.Path, "/"), "/") - - if len(tokens)%2 != 0 { - return nil, fmt.Errorf("unexpected url %q (unexpected tokens)", selfLink) - } - - return parseTokens(link, tokens) -} diff --git a/pkg/googleurl/parser_test.go b/pkg/googleurl/parser_test.go deleted file mode 100644 index 130d5bf5..00000000 --- a/pkg/googleurl/parser_test.go +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright 2022 The kpt and Nephio Authors -// -// 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 googleurl - -import ( - "testing" - - "github.com/google/go-cmp/cmp" -) - -func TestParse(t *testing.T) { - grid := []struct { - SelfLink string - Want Link - }{ - { - SelfLink: "https://container.googleapis.com/v1/projects/justinsb-acp-dev/locations/us-central1/clusters/auto-gke/nodePools/default-pool", - Want: Link{ - Service: "container.googleapis.com", - Version: "v1", - Project: "justinsb-acp-dev", - Location: "us-central1", - Extra: map[string]string{ - "clusters": "auto-gke", - "nodePools": "default-pool", - }, - }, - }, - { - SelfLink: "//gkehub.googleapis.com/v1/projects/justinsb-acp-dev/locations/global/memberships/example-cluster-1", - Want: Link{ - Service: "gkehub.googleapis.com", - Version: "v1", - Project: "justinsb-acp-dev", - Location: "global", - Extra: map[string]string{ - "memberships": "example-cluster-1", - }, - }, - }, - } - - for _, g := range grid { - t.Run(g.SelfLink, func(t *testing.T) { - got, err := Parse(g.SelfLink) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - if diff := cmp.Diff(g.Want, *got); diff != "" { - t.Errorf("unexpected diff (+got,-want): %s", diff) - } - }) - } -} - -func TestParseUnversioned(t *testing.T) { - grid := []struct { - SelfLink string - Want Link - }{ - { - SelfLink: "//container.googleapis.com/projects/example-project/locations/us-central1/clusters/example-cluster", - Want: Link{ - Service: "container.googleapis.com", - Project: "example-project", - Location: "us-central1", - Extra: map[string]string{ - "clusters": "example-cluster", - }, - }, - }, - } - - for _, g := range grid { - t.Run(g.SelfLink, func(t *testing.T) { - got, err := ParseUnversioned(g.SelfLink) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - if diff := cmp.Diff(g.Want, *got); diff != "" { - t.Errorf("unexpected diff (+got,-want): %s", diff) - } - }) - } -}