remove duplicated appoffer tag (#1374)

canonical · Sep 20, 2024 · dc065a3 · dc065a3
1 parent 7dfac5a
commit dc065a3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 66 deletions.
diff --git a/internal/discharger/discharger.go b/internal/discharger/discharger.go
@@ -22,7 +22,6 @@ import (
 	"github.com/canonical/jimm/v3/internal/errors"
 	"github.com/canonical/jimm/v3/internal/openfga"
 	ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
-	jimmnames "github.com/canonical/jimm/v3/pkg/names"
 )
 
 var defaultDischargeExpiry = 15 * time.Minute
@@ -120,7 +119,7 @@ func (md *MacaroonDischarger) CheckThirdPartyCaveat(ctx context.Context, req *ht
 		return nil, checkers.ErrCaveatNotRecognized
 	}
 
-	offerTag := jimmnames.NewApplicationOfferTag(offerUUID)
+	offerTag := names.NewApplicationOfferTag(offerUUID)
 
 	i, err := dbmodel.NewIdentity(userTag.Id())
 	if err != nil {

diff --git a/internal/jimm/applicationoffer.go b/internal/jimm/applicationoffer.go
@@ -22,7 +22,6 @@ import (
 	"github.com/canonical/jimm/v3/internal/errors"
 	"github.com/canonical/jimm/v3/internal/openfga"
 	ofganames "github.com/canonical/jimm/v3/internal/openfga/names"
-	jimmnames "github.com/canonical/jimm/v3/pkg/names"
 )
 
 // AddApplicationOfferParams holds parameters for the Offer method.
@@ -214,7 +213,7 @@ func (j *JIMM) GetApplicationOfferConsumeDetails(ctx context.Context, user *open
 		&offer.Model.Controller,
 		names.ModelTag{},
 		permission{
-			resource: jimmnames.NewApplicationOfferTag(offer.UUID).String(),
+			resource: names.NewApplicationOfferTag(offer.UUID).String(),
 			relation: accessLevel,
 		},
 	)
@@ -332,7 +331,7 @@ func (j *JIMM) GetApplicationOffer(ctx context.Context, user *openfga.User, offe
 		&offer.Model.Controller,
 		names.ModelTag{},
 		permission{
-			resource: jimmnames.NewApplicationOfferTag(offer.UUID).String(),
+			resource: names.NewApplicationOfferTag(offer.UUID).String(),
 			relation: accessLevel,
 		},
 	)
@@ -535,7 +534,7 @@ func (j *JIMM) UpdateApplicationOffer(ctx context.Context, controller *dbmodel.C
 		&offer.Model.Controller,
 		names.ModelTag{},
 		permission{
-			resource: jimmnames.NewApplicationOfferTag(offer.UUID).String(),
+			resource: names.NewApplicationOfferTag(offer.UUID).String(),
 			relation: string(jujuparams.OfferAdminAccess),
 		},
 	)
@@ -817,7 +816,7 @@ func (j *JIMM) doApplicationOfferAdmin(ctx context.Context, user *openfga.User,
 		&offer.Model.Controller,
 		names.ModelTag{},
 		permission{
-			resource: jimmnames.NewApplicationOfferTag(offer.UUID).String(),
+			resource: names.NewApplicationOfferTag(offer.UUID).String(),
 			relation: string(jujuparams.OfferAdminAccess),
 		},
 	)

diff --git a/internal/openfga/openfga.go b/internal/openfga/openfga.go
@@ -42,7 +42,7 @@ var (
 	// ModelType represents a model object.
 	ModelType Kind = names.ModelTagKind
 	// ApplicationOfferType represents an application offer object.
-	ApplicationOfferType Kind = jimmnames.ApplicationOfferTagKind
+	ApplicationOfferType Kind = names.ApplicationOfferTagKind
 	// CloudType represents a cloud object.
 	CloudType Kind = names.CloudTagKind
 	// ControllerType represents a controller object.

diff --git a/pkg/names/applicationoffer.go b/pkg/names/applicationoffer.go
diff --git a/pkg/names/names.go b/pkg/names/names.go
@@ -42,11 +42,6 @@ func ParseTag(tag string) (names.Tag, error) {
 			return nil, invalidTagError(tag, kind)
 		}
 		return NewGroupTag(id), nil
-	case ApplicationOfferTagKind:
-		if !IsValidApplicationOfferTag(id) {
-			return nil, invalidTagError(tag, kind)
-		}
-		return NewApplicationOfferTag(id), nil
 	case ServiceAccountTagKind:
 		if !IsValidServiceAccountId(id) {
 			return nil, invalidTagError(tag, kind)