Merge pull request #113 from wallyworld/applicationoffer-uuid

#113 The application offer tag payload is now the offer uuid, not name. Because this is a breaking change, rev the module to v5. Jira card: JUJU-5211
juju · Dec 15, 2023 · 2971c5b · 2971c5b
2 parents 3f671f1 + 404c027
commit 2971c5b
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 206 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for juju/names
 #
 
-PROJECT := github.com/juju/names/v4
+PROJECT := github.com/juju/names/v5
 PROJECT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 PROJECT_PACKAGES := $(shell go list $(PROJECT)/... | grep -v /acceptancetests/)
 TEST_TIMEOUT := 600s

diff --git a/action_test.go b/action_test.go
@@ -7,7 +7,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type actionSuite struct{}

diff --git a/application_test.go b/application_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type applicationSuite struct{}

diff --git a/applicationoffer.go b/applicationoffer.go
@@ -3,21 +3,11 @@
 
 package names
 
-import (
-	"regexp"
-)
-
 const ApplicationOfferTagKind = "applicationoffer"
 
-const (
-	ApplicationOfferSnippet = "(?:[a-z][a-z0-9]*(?:-[a-z0-9]*[a-z][a-z0-9]*)*)"
-)
-
-var validApplicationOffer = regexp.MustCompile("^" + ApplicationOfferSnippet + "$")
-
 // IsValidApplicationOffer returns whether name is a valid application offer name.
-func IsValidApplicationOffer(name string) bool {
-	return validApplicationOffer.MatchString(name)
+func IsValidApplicationOffer(uuid string) bool {
+	return validUUID.MatchString(uuid)
 }
 
 type ApplicationOfferTag struct {

diff --git a/applicationoffer_test.go b/applicationoffer_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type applicationOfferSuite struct{}
@@ -21,8 +21,8 @@ var parseApplicationOfferTagTests = []struct {
 	tag: "",
 	err: names.InvalidTagError("", ""),
 }, {
-	tag:      "applicationoffer-dave",
-	expected: names.NewApplicationOfferTag("dave"),
+	tag:      "applicationoffer-f47ac10b-58cc-4372-a567-0e02b2c3d479",
+	expected: names.NewApplicationOfferTag("f47ac10b-58cc-4372-a567-0e02b2c3d479"),
 }, {
 	tag: "dave",
 	err: names.InvalidTagError("dave", ""),

diff --git a/caasmodel_test.go b/caasmodel_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type caasModelSuite struct{}

diff --git a/charm_test.go b/charm_test.go
@@ -9,7 +9,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type charmSuite struct{}

diff --git a/cloud_test.go b/cloud_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type cloudSuite struct{}

diff --git a/cloudcredential_test.go b/cloudcredential_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type cloudCredentialSuite struct{}

diff --git a/controller_test.go b/controller_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type controllerSuite struct{}

diff --git a/controlleragent_test.go b/controlleragent_test.go
@@ -7,7 +7,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type ControllerAgentSuite struct{}

diff --git a/environ_test.go b/environ_test.go
@@ -6,7 +6,7 @@ package names_test
 import (
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type environSuite struct{}

diff --git a/filesystem_test.go b/filesystem_test.go
@@ -8,7 +8,7 @@ import (
 
 	gc "gopkg.in/check.v1"
 
-	"github.com/juju/names/v4"
+	"github.com/juju/names/v5"
 )
 
 type filesystemSuite struct{}

diff --git a/go.mod b/go.mod
@@ -1,26 +1,21 @@
-module github.com/juju/names/v4
+module github.com/juju/names/v5
 
-go 1.17
+go 1.21
 
 require (
-	github.com/juju/errors v0.0.0-20220203013757-bd733f3c86b9
-	github.com/juju/testing v0.0.0-20220203020004-a0ff61f03494
-	github.com/juju/utils/v3 v3.0.0-20220203023959-c3fbc78a33b0
+	github.com/juju/errors v1.0.0
+	github.com/juju/testing v1.1.0
+	github.com/juju/utils/v3 v3.1.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 )
 
 require (
-	github.com/juju/clock v0.0.0-20220203021603-d9deb868a28a // indirect
-	github.com/juju/collections v0.0.0-20220203020748-febd7cad8a7a // indirect
-	github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
-	github.com/juju/mgo/v2 v2.0.0-20220111072304-f200228f1090 // indirect
-	github.com/juju/retry v0.0.0-20220204093819-62423bf33287 // indirect
-	github.com/juju/version/v2 v2.0.0-20220204124744-fc9915e3d935 // indirect
-	github.com/kr/pretty v0.2.1 // indirect
+	github.com/juju/clock v1.0.2 // indirect
+	github.com/juju/loggo v1.0.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/xdg-go/stringprep v1.0.2 // indirect
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
-	golang.org/x/text v0.3.7 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
+	golang.org/x/crypto v0.3.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )