commitment: remove empty behaviors.

rearrange flatresourcetoplogy condition
sapcc · Dec 5, 2024 · 95e45d5 · 95e45d5
1 parent 8f5f123
commit 95e45d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/internal/api/commitment.go b/internal/api/commitment.go
@@ -240,14 +240,14 @@ func (p *v1Provider) parseAndValidateCommitmentRequest(w http.ResponseWriter, r
 		http.Error(w, "commitments are not enabled for this resource", http.StatusUnprocessableEntity)
 		return nil, nil, nil
 	}
-	if resInfo.Topology != liquid.FlatResourceTopology {
-		if !slices.Contains(p.Cluster.Config.AvailabilityZones, req.AvailabilityZone) {
-			http.Error(w, "no such availability zone", http.StatusUnprocessableEntity)
+	if resInfo.Topology == liquid.FlatResourceTopology {
+		if req.AvailabilityZone != limes.AvailabilityZoneAny {
+			http.Error(w, `resource does not accept AZ-aware commitments, so the AZ must be set to "any"`, http.StatusUnprocessableEntity)
 			return nil, nil, nil
 		}
 	} else {
-		if req.AvailabilityZone != limes.AvailabilityZoneAny {
-			http.Error(w, `resource does not accept AZ-aware commitments, so the AZ must be set to "any"`, http.StatusUnprocessableEntity)
+		if !slices.Contains(p.Cluster.Config.AvailabilityZones, req.AvailabilityZone) {
+			http.Error(w, "no such availability zone", http.StatusUnprocessableEntity)
 			return nil, nil, nil
 		}
 	}

diff --git a/internal/api/commitment_test.go b/internal/api/commitment_test.go
@@ -49,8 +49,6 @@ const testCommitmentsYAML = `
 		- resource: first/.*
 			commitment_durations: ["1 hour", "2 hours"]
 			commitment_min_confirm_date: '1970-01-08T00:00:00Z' # one week after start of mock.Clock
-		- resource: first/things
-		- resource: first/capacity
 `
 const testCommitmentsYAMLWithoutMinConfirmDate = `
 	availability_zones: [ az-one, az-two ]