Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds a new subscription endpoint to save to cache #48

Merged
merged 1 commit into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions frontend/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@ package main
// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

import "github.com/Azure/ARO-HCP/internal/api"
import (
"github.com/Azure/ARO-HCP/internal/api"
"github.com/Azure/ARO-HCP/internal/api/subscription"
)

type cache struct {
cluster map[string]*api.HCPOpenShiftCluster
cluster map[string]*api.HCPOpenShiftCluster
subscription map[string]*subscription.Subscription
}

// NewCache returns a new cache.
func NewCache() *cache {
return &cache{
cluster: make(map[string]*api.HCPOpenShiftCluster),
cluster: make(map[string]*api.HCPOpenShiftCluster),
subscription: make(map[string]*subscription.Subscription),
}
}

Expand All @@ -28,3 +33,16 @@ func (c *cache) SetCluster(id string, cluster *api.HCPOpenShiftCluster) {
func (c *cache) DeleteCluster(id string) {
delete(c.cluster, id)
}

func (c *cache) GetSubscription(id string) (*subscription.Subscription, bool) {
subscription, found := c.subscription[id]
return subscription, found
}

func (c *cache) SetSubscription(id string, subscription *subscription.Subscription) {
c.subscription[id] = subscription
}

func (c *cache) DeleteSubscription(id string) {
delete(c.subscription, id)
}
32 changes: 32 additions & 0 deletions frontend/frontend.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (

"github.com/Azure/ARO-HCP/internal/api"
"github.com/Azure/ARO-HCP/internal/api/arm"
"github.com/Azure/ARO-HCP/internal/api/subscription"
)

const (
Expand Down Expand Up @@ -97,6 +98,7 @@ func NewFrontend(logger *slog.Logger, listener net.Listener) *Frontend {
mux.Handle(
MuxPattern(http.MethodPost, PatternSubscriptions, PatternResourceGroups, PatternProviders, PatternResourceName, PatternActionName),
postMuxMiddleware.HandlerFunc(f.ArmResourceAction))
mux.Handle(MuxPattern(http.MethodPut, PatternSubscriptions), postMuxMiddleware.HandlerFunc(f.ArmSubscriptionAction))
f.server.Handler = mux

return f
Expand Down Expand Up @@ -277,3 +279,33 @@ func (f *Frontend) ArmResourceAction(writer http.ResponseWriter, request *http.R

writer.WriteHeader(http.StatusOK)
}

func (f *Frontend) ArmSubscriptionAction(writer http.ResponseWriter, request *http.Request) {
ctx := request.Context()
logger := ctx.Value(ContextKeyLogger).(*slog.Logger)
versionedInterface := ctx.Value(ContextKeyVersion).(api.Version)
logger.Info(fmt.Sprintf("%s: ArmSubscriptionAction", versionedInterface))

body := ctx.Value(ContextKeyBody).([]byte)
var subscription subscription.Subscription
err := json.Unmarshal(body, &subscription)
if err != nil {
f.logger.Error(err.Error())
writer.WriteHeader(http.StatusBadRequest)
return
}

subId := request.PathValue(strings.ToLower(PathSegmentSubscriptionID))
f.cache.SetSubscription(subId, &subscription)

resp, err := json.Marshal(subscription)
if err != nil {
f.logger.Error(err.Error())
writer.WriteHeader(http.StatusInternalServerError)
return
}
_, err = writer.Write(resp)
if err != nil {
f.logger.Error(err.Error())
}
}
29 changes: 29 additions & 0 deletions internal/api/subscription/register.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package subscription

// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

import (
"github.com/Azure/ARO-HCP/internal/api"
)

type version struct{}

// NewHCPOpenShiftCluster implements api.Version.
func (v version) NewHCPOpenShiftCluster(*api.HCPOpenShiftCluster) api.VersionedHCPOpenShiftCluster {
panic("'System Version 2.0' is not supported for HCP Cluster objects")
}

// UnmarshalHCPOpenShiftCluster implements api.Version.
func (v version) UnmarshalHCPOpenShiftCluster([]byte, bool, *api.HCPOpenShiftCluster) error {
panic("'System Version 2.0' is not supported for HCP Cluster objects")
}

// String returns the api-version parameter value for this API.
func (v version) String() string {
return "2.0"
}

func init() {
api.Register(version{})
}
46 changes: 46 additions & 0 deletions internal/api/subscription/subscription.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package subscription

// Copyright (c) Microsoft Corporation.
// Licensed under the Apache License 2.0.

type Subscription struct {
State RegistrationState `json:"state"`
RegsitrationDate *string `json:"registrationDate,omitempty"`
Properties *Properties `json:"properties,omitempty"`
}

type Properties struct {
TenantId *string `json:"tenantId,omitempty"`
LocationPlacementId *string `json:"locationPlacementId,omitempty"`
QuotaId *string `json:"quotaId,omitempty"`
RegisteredFeatures *[]Feature `json:"registeredFeatures,omitempty"`
AvailabilityZones *AvailabilityZone `json:"availabilityZones,omitempty"`
SpendingLimit *string `json:"spendingLimit,omitempty"`
AccountOwner *map[string]string `json:"accountOwner,omitempty"`
ManagedByTenants *[]map[string]string `json:"managedByTenants,omitempty"`
AdditionalProperties *map[string]string `json:"additionalProperties,omitempty"`
}

type Feature struct {
Name *string `json:"name,omitempty"`
State *string `json:"state,omitempty"`
}

type AvailabilityZone struct {
Location *string `json:"location,omitempty"`
ZoneMappings *[]ZoneMapping `json:"zoneMppings,omitempty"`
}

type ZoneMapping struct {
LogicalZone *string `json:"logicalZone,omitempty"`
PhysicalZone *string `json:"physicalZone,omitempty"`
}
type RegistrationState string

const (
Registered RegistrationState = "Registered"
Unregistered RegistrationState = "Unregistered"
Warned RegistrationState = "Warned"
Deleted RegistrationState = "Deleted"
Suspended RegistrationState = "Suspended"
)
Loading