feat(grafanactl): add PublicNetworkAccess support for Grafana instances #279
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| // Copyright 2026 Microsoft Corporation | ||
| // | ||
| // 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 manage | ||
|
|
||
| import ( | ||
| "context" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestDefaultReconcileOptions(t *testing.T) { | ||
| opts := DefaultReconcileOptions() | ||
|
|
||
| if opts.SKU != "Standard" { | ||
| t.Fatalf("expected default SKU 'Standard', got %q", opts.SKU) | ||
| } | ||
| if opts.ZoneRedundancy != "Disabled" { | ||
| t.Fatalf("expected default ZoneRedundancy 'Disabled', got %q", opts.ZoneRedundancy) | ||
| } | ||
| if opts.PublicNetworkAccess != "Disabled" { | ||
| t.Fatalf("expected default PublicNetworkAccess 'Disabled', got %q", opts.PublicNetworkAccess) | ||
| } | ||
| } | ||
|
|
||
| func TestValidatePublicNetworkAccess(t *testing.T) { | ||
| for _, tc := range []struct { | ||
| name string | ||
| publicNetworkAccess string | ||
| wantErrSub string | ||
| }{ | ||
| { | ||
| name: "Enabled is valid", | ||
| publicNetworkAccess: "Enabled", | ||
| }, | ||
| { | ||
| name: "Disabled is valid", | ||
| publicNetworkAccess: "Disabled", | ||
| }, | ||
| { | ||
| name: "empty string is rejected", | ||
| publicNetworkAccess: "", | ||
| wantErrSub: "--public-network-access must be", | ||
| }, | ||
| { | ||
| name: "invalid value is rejected", | ||
| publicNetworkAccess: "Invalid", | ||
| wantErrSub: "--public-network-access must be", | ||
| }, | ||
| { | ||
| name: "lowercase is rejected", | ||
| publicNetworkAccess: "enabled", | ||
| wantErrSub: "--public-network-access must be", | ||
| }, | ||
| } { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| opts := DefaultReconcileOptions() | ||
| opts.Location = "eastus" | ||
| opts.GrafanaName = "test-grafana" | ||
| opts.SubscriptionID = "00000000-0000-0000-0000-000000000000" | ||
| opts.ResourceGroup = "test-rg" | ||
| opts.PublicNetworkAccess = tc.publicNetworkAccess | ||
|
|
||
| _, err := opts.Validate(context.Background()) | ||
| if tc.wantErrSub != "" { | ||
| if err == nil { | ||
| t.Fatalf("expected error containing %q, got nil", tc.wantErrSub) | ||
| } | ||
| if !strings.Contains(err.Error(), tc.wantErrSub) { | ||
| t.Fatalf("expected error containing %q, got %q", tc.wantErrSub, err.Error()) | ||
| } | ||
| return | ||
| } | ||
| if err != nil { | ||
| t.Fatalf("unexpected error: %v", err) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Defaulting to "Disabled" provides a secure-by-default design but risks locking down all environments if this change isn't paired with the new ARO-HCP changes in a timely manner.
Defaulting to "Enabled" ensures backwards-compatibility if these were merged early but breaks the secure-by-default pattern.
My vote is for secure by default as I think the risk is low; however, I'm open to feedback.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Going to switch this to backwards compatible (enabled by default)