-
Notifications
You must be signed in to change notification settings - Fork 105
admin-api simulation tests #3863
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
Open
geoberle
wants to merge
9
commits into
main
Choose a base branch
from
admin-simulation-tests
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
adf8c40
admin-api simulation tests
geoberle a13133f
fix path bug in cosmos startup script
geoberle b8433eb
fix comment
geoberle 344ea26
make vnext cosmos usage explicit
geoberle 188bcbd
increase max containers in cosmos
geoberle e15d8ad
new cosmos id format
geoberle 365ee20
use existing http steps
geoberle 8871bc1
harmonize emulator startup scripts / keep running instance on local r…
geoberle 6d9efb4
dispatch httptestaccessor creation based on resourceID format
geoberle File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,69 @@ | ||
| // Copyright 2025 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 admin | ||
|
|
||
| import ( | ||
| "context" | ||
| "embed" | ||
| "io/fs" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/Azure/ARO-HCP/internal/api" | ||
| "github.com/Azure/ARO-HCP/test-integration/utils/databasemutationhelpers" | ||
| "github.com/Azure/ARO-HCP/test-integration/utils/integrationutils" | ||
| ) | ||
|
|
||
| //go:embed artifacts | ||
| var artifacts embed.FS | ||
|
|
||
| func TestAdminCRUD(t *testing.T) { | ||
| integrationutils.SkipIfNotSimulationTesting(t) | ||
|
|
||
| ctx := context.Background() | ||
| ctx, cancel := context.WithCancel(ctx) | ||
| defer cancel() | ||
|
|
||
| allCRUDDirFS, err := fs.Sub(artifacts, "artifacts/AdminCRUD") | ||
| require.NoError(t, err) | ||
|
|
||
| crudSuiteDirs := api.Must(fs.ReadDir(allCRUDDirFS, ".")) | ||
| for _, crudSuiteDirEntry := range crudSuiteDirs { | ||
| crudSuiteDir := api.Must(fs.Sub(allCRUDDirFS, crudSuiteDirEntry.Name())) | ||
| t.Run(crudSuiteDirEntry.Name(), func(t *testing.T) { | ||
| testAdminCRUDSuite( | ||
| ctx, | ||
| t, | ||
| crudSuiteDir) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func testAdminCRUDSuite(ctx context.Context, t *testing.T, crudSuiteDir fs.FS) { | ||
| testDirs := api.Must(fs.ReadDir(crudSuiteDir, ".")) | ||
| for _, testDirEntry := range testDirs { | ||
| testDir := api.Must(fs.Sub(crudSuiteDir, testDirEntry.Name())) | ||
|
|
||
| currTest, err := databasemutationhelpers.NewAdminResourceMutationTest( | ||
| ctx, | ||
| testDirEntry.Name(), | ||
| testDir, | ||
| ) | ||
| require.NoError(t, err) | ||
|
|
||
| t.Run(testDirEntry.Name(), currTest.RunTest) | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
...on/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json
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,25 @@ | ||
| { | ||
| "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|some-hcp-cluster", | ||
| "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", | ||
| "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters", | ||
| "properties": { | ||
| "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", | ||
| "identity": { | ||
| "type": "UserAssigned" | ||
| }, | ||
| "internalState": { | ||
| "internalAPI": { | ||
| "location": "eastus", | ||
| "serviceProviderProperties": { | ||
| "clusterServiceID": "" | ||
| } | ||
| } | ||
| }, | ||
| "provisioningState": "Succeeded", | ||
| "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", | ||
| "systemData": {}, | ||
| "tags": { | ||
| "foo": "bar" | ||
| } | ||
| } | ||
| } |
90 changes: 90 additions & 0 deletions
90
...n/artifacts/AdminCRUD/HCP/hello-world/01-loadClusterService-initial-state/01-cluster.json
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 @@ | ||
| { | ||
| "api": { | ||
| "cidr_block_access": { | ||
| "allow": { | ||
| "mode": "allow_all" | ||
| } | ||
| }, | ||
| "listening": "external" | ||
| }, | ||
| "azure": { | ||
| "etcd_encryption": { | ||
| "data_encryption": { | ||
| "customer_managed": { | ||
| "encryption_type": "kms", | ||
| "kms": { | ||
| "active_key": { | ||
| "key_name": "encryptionKeyName", | ||
| "key_vault_name": "keyVaultName", | ||
| "key_version": "2024-12-01-preview" | ||
| } | ||
| } | ||
| }, | ||
| "key_management_mode": "customer_managed" | ||
| } | ||
| }, | ||
| "managed_resource_group_name": "fake-mrg-name", | ||
| "network_security_group_resource_id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", | ||
| "nodes_outbound_connectivity": { | ||
| "outbound_type": "load_balancer" | ||
| }, | ||
| "operators_authentication": { | ||
| "managed_identities": { | ||
| "control_plane_operators_managed_identities": {}, | ||
| "data_plane_operators_managed_identities": {}, | ||
| "managed_identities_data_plane_identity_url": "" | ||
| } | ||
| }, | ||
| "resource_group_name": "resourcegroupname", | ||
| "resource_name": "create-with-tags", | ||
| "subnet_resource_id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet", | ||
| "subscription_id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", | ||
| "tenant_id": "fake-tenant-id" | ||
| }, | ||
| "ccs": { | ||
| "enabled": true, | ||
| "kind": "CCS" | ||
| }, | ||
| "cloud_provider": { | ||
| "id": "azure", | ||
| "kind": "CloudProvider" | ||
| }, | ||
| "flavour": { | ||
| "id": "osd-4", | ||
| "kind": "Flavour" | ||
| }, | ||
| "href": "/api/aro_hcp/v1alpha1/clusters/fixed-value", | ||
| "hypershift": { | ||
| "enabled": true | ||
| }, | ||
| "id": "fixed-value", | ||
| "image_registry": { | ||
| "state": "disabled" | ||
| }, | ||
| "kind": "Cluster", | ||
| "name": "create-with-tags", | ||
| "network": { | ||
| "host_prefix": 23, | ||
| "machine_cidr": "10.0.0.0/16", | ||
| "pod_cidr": "10.128.0.0/14", | ||
| "service_cidr": "172.30.0.0/16", | ||
| "type": "OVNKubernetes" | ||
| }, | ||
| "node_drain_grace_period": { | ||
| "unit": "minutes", | ||
| "value": 0 | ||
| }, | ||
| "product": { | ||
| "id": "aro", | ||
| "kind": "Product" | ||
| }, | ||
| "region": { | ||
| "id": "fake-location", | ||
| "kind": "CloudRegion" | ||
| }, | ||
| "version": { | ||
| "channel_group": "stable", | ||
| "id": "", | ||
| "kind": "Version" | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/02-httpGet-helloworld/00-key.json
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,3 @@ | ||
| { | ||
| "resourceID": "/admin/v1/hcp/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster/helloworld" | ||
| } |
8 changes: 8 additions & 0 deletions
8
...tegration/admin/artifacts/AdminCRUD/HCP/hello-world/02-httpGet-helloworld/helloworld.json
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,8 @@ | ||
| { | ||
| "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", | ||
| "internalClusterID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", | ||
| "clientPrincipalName": "test-user@example.com", | ||
| "tenantID": "fake-tenant-id", | ||
| "managedResourceGroup": "fake-mrg-name", | ||
| "hcpName": "some-hcp-cluster" | ||
| } |
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
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.
Help me understand what's going on here?
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.
Listing the LBs of the managed RG was just for showcasing the FPA creds in this demo handler. I did not want to spend time introducing fakes for the LB azure service at this point if we will not need it.
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.
Let's go in the other direction. Backend wants these creds in @miguelsorianod's PR. Let's actually start an endpoint to pull useful/important azure resources for debugging a cluster.