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

Upgrade version of APIM SDK #4603

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 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
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package customizations
import (
"context"

"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2"
"github.com/go-logr/logr"
"github.com/rotisserie/eris"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

. "github.com/Azure/azure-service-operator/v2/internal/logging"

"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2"
"github.com/go-logr/logr"
"github.com/rotisserie/eris"
v1 "k8s.io/api/core/v1"
Expand Down
3 changes: 2 additions & 1 deletion v2/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.23.4
require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement v1.1.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2 v2.1.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appconfiguration/armappconfiguration v1.1.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice v1.0.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos v1.0.0
Expand Down Expand Up @@ -69,6 +69,7 @@ require (
cel.dev/expr v0.18.0 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions v2/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.1 h1:Bk5uOhSAenHyR5P
github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.1/go.mod h1:QZ4pw3or1WPmRBxf0cHd1tknzrT54WPBOQoGutCPvSU=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement v1.1.1 h1:jCkNVNpsEevyic4bmjgVjzVA4tMGSJpXNGirf+S+mDI=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement v1.1.1/go.mod h1:a0Ug1l73Il7EhrCJEEt2dGjlNjvphppZq5KqJdgnwuw=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2 v2.1.0 h1:WYADp5XlioccEnBBK9sVUaHVno76l7WeTcWCumN86kM=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/apimanagement/armapimanagement/v2 v2.1.0/go.mod h1:PK8v1aAd2Wx6eTcbUYhYstGpspqNqhZYiM8GLFdq2A0=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appconfiguration/armappconfiguration v1.1.1 h1:iRc20pGuVlc1HwRO2bg0m1tfP9rkPB0K88trl8Fei2w=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/appconfiguration/armappconfiguration v1.1.1/go.mod h1:21Lewei+tg5zp5xmyOxfDY//2tBvWQXee0UoM8xZjr8=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice v1.0.0 h1:figxyQZXzZQIcP3njhC68bYUiTw45J8/SsHaLW8Ax0M=
Expand Down
3,590 changes: 2,087 additions & 1,503 deletions v2/internal/controllers/recordings/Test_ApiManagement_20220801_CRUD.yaml

Large diffs are not rendered by default.

2,576 changes: 1,396 additions & 1,180 deletions v2/internal/controllers/recordings/Test_ApiManagement_20230501preview_CRUD.yaml

Large diffs are not rendered by default.

69 changes: 69 additions & 0 deletions v2/samples/apimanagement/v1api20230501preview/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Test Tips

API Management Services are soft-deleted by default, which can make running tests difficult.

Before you can do a clean run of a test, you need to ensure any soft-deleted debris from prior test runs has been purged.

To purge a soft-deleted service, you have to use **az** - as of Dec 2024, it cannot be done via the Azure portal.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this net new? If so, why not as of Feb 2025?


## Checking for soft-deleted services

### Using az apim

List all known soft-deleted services.

```bash
$ az apim deletedservice list --query "[].[name, location]"
[
[
"asotest-apimsvcv2-yovquu",
"East US 2"
],
[
"asotest-apimanagementv2-yovquu",
"East US"
],
[
"asotestqpewjd",
"East US"
],
[
"asotest-apimanagementv2-twykac",
"East US"
]
]
```

### Using az rest

If you get an error from `az apim deletedservice list`, an alternative is to use their REST API directly. Fortunately, **az** lets you do this too

``` bash
az rest --method get --url https://management.azure.com/subscriptions/{subscription}/providers/Microsoft.ApiManagement/deletedservices?api-version=2021-08-01
```

## Purging soft-deleted services

### Using az apim

You need to specify both the service name and location.

```bash
az apim deletedservice purge --service-name "asotestqpewjd" --location "eastus"
```

Deletion is slow - it can take a few minutes for az to return. After that, give it another 10m or so before rerunning your test.

For more information, see https://andrewilson.co.uk/post/2022/09/apim-purge-soft-deleted-instance/

### Using az rest

Similarly, you can use **az** to purge a selected instance via the REST API. Fill in `{subscription}`, `{location}` asd `{service-name}` and run this command:

``` bash
az rest --method delete --url https://management.azure.com/subscriptions/{subscription}/providers/Microsoft.ApiManagement/locations/{location}/deletedservices/{service-name}?api-version=2021-08-01
```

## Troubleshooting

If APIM are having an outage, or their API doesn't work for whatever reason, you may find you simply need to wait 48h+ for the soft-delete to turn into a hard-delete.
Loading