Skip to content
Open
Show file tree
Hide file tree
Changes from 3 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
1 change: 1 addition & 0 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ io.clientcore:optional-dependency-tests;1.0.0-beta.1;1.0.0-beta.1

unreleased_com.azure.v2:azure-core;2.0.0-beta.1
unreleased_com.azure.v2:azure-identity;2.0.0-beta.1
unreleased_com.azure.v2:azure-security-keyvault-keys;5.0.0-beta.1
unreleased_io.clientcore:http-netty4;1.0.0-beta.1

# Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<!-- This file is generated by the /eng/scripts/linting_suppression_generator.py script. -->

<suppressions>
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientImpl.java" checks="com.azure.tools.checkstyle.checks.RawExceptionThrow" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientImpl.java" checks="com.azure.tools.checkstyle.checks.RawExceptionThrow" />
<suppress files="com.azure.v2.security.keyvault.keys.KeyClient.java" checks="com.azure.tools.checkstyle.checks.ServiceClient" />
<suppress files="com.azure.v2.security.keyvault.keys.cryptography.CryptographyClient.java" checks="com.azure.tools.checkstyle.checks.ServiceClient" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientImpl.java" checks="io.clientcore.linting.extensions.checkstyle.checks.RawExceptionThrowCheck" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientImpl.java" checks="io.clientcore.linting.extensions.checkstyle.checks.RawExceptionThrowCheck" />
<suppress files="com.azure.v2.security.keyvault.keys.KeyClient.java" checks="io.clientcore.linting.extensions.checkstyle.checks.ServiceClientCheck" />
<suppress files="com.azure.v2.security.keyvault.keys.cryptography.CryptographyClient.java" checks="io.clientcore.linting.extensions.checkstyle.checks.ServiceClientCheck" />

<!-- Generated classes -->
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientServiceImpl.java" checks="FinalClass" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientServiceImpl.java" checks="com.azure.tools.checkstyle.checks.GoodLogging" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientServiceImpl.java" checks="JavadocPackage" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientServiceImpl.java" checks="com.azure.tools.checkstyle.checks.RawExceptionThrow" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientServiceImpl.java" checks="io.clientcore.linting.extensions.checkstyle.checks.GoodLoggingCheck" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.*" checks="JavadocPackage" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.KeyClientServiceImpl.java" checks="io.clientcore.linting.extensions.checkstyle.checks.RawExceptionThrowCheck" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientServiceImpl.java" checks="FinalClass" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientServiceImpl.java" checks="com.azure.tools.checkstyle.checks.GoodLogging" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientServiceImpl.java" checks="com.azure.tools.checkstyle.checks.RawExceptionThrow" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientServiceImpl.java" checks="io.clientcore.linting.extensions.checkstyle.checks.GoodLoggingCheck" />
<suppress files="com.azure.v2.security.keyvault.keys.implementation.SecretMinClientServiceImpl.java" checks="io.clientcore.linting.extensions.checkstyle.checks.RawExceptionThrowCheck" />
</suppressions>
12 changes: 12 additions & 0 deletions sdk/tools/azure-openrewrite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@
<version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure.v2:azure-core;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure.v2</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>5.0.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure.v2:azure-security-keyvault-keys;dependency} -->
<scope>test</scope>
</dependency>
</dependencies>
</profile>

Expand Down Expand Up @@ -372,6 +378,12 @@
<version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure.v2:azure-identity;dependency} -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.azure.v2</groupId>
<artifactId>azure-security-keyvault-keys</artifactId>
<version>5.0.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure.v2:azure-security-keyvault-keys;dependency} -->
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ recipeList:
# --------------------------------------------------------------------
# NoopMeter
# --------------------------------------------------------------------

# paging

# --------------------------------------------------------------------
Expand Down Expand Up @@ -499,6 +499,10 @@ recipeList:
# LongRunningOperationStatus
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.core.util.polling.LongRunningOperationStatus
newFullyQualifiedTypeName: com.azure.v2.core.http.polling.LongRunningOperationStatus

# TODO: API Removed. Triage replacement

# --------------------------------------------------------------------
Expand All @@ -517,6 +521,10 @@ recipeList:
# PollResponse
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.core.util.polling.PollResponse
newFullyQualifiedTypeName: com.azure.v2.core.http.polling.PollResponse

# TODO: API Removed. Triage replacement

# --------------------------------------------------------------------
Expand Down Expand Up @@ -595,6 +603,10 @@ recipeList:
# SyncPoller
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.core.util.polling.SyncPoller
newFullyQualifiedTypeName: com.azure.v2.core.http.polling.Poller

# TODO: API Removed. Triage replacement

# --------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@ recipeList:
methodPattern: "com.azure.v2.identity.ClientCertificateCredentialBuilder pemCertificate(..)"
newMethodName: "clientCertificate"

# --------------------------------------------------------------------
# NEED TO MOVE IT OUT FROM HERE
Copy link
Member

Choose a reason for hiding this comment

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

Could you add more details on what is the expected change for this recipe? Where should this be moved to?

# --------------------------------------------------------------------
- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.identity.DefaultAzureCredentialBuilder
newFullyQualifiedTypeName: com.azure.v2.identity.DefaultAzureCredentialBuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
# --------------------------------------------------------------------
# Migration Recipes for Azure security-keyvault-keys Library
# --------------------------------------------------------------------
type: specs.openrewrite.org/v1beta/recipe
name: com.azure.openrewrite.migration.security.keyvault.keys
displayName: Migrate from azure-security-keyvault-keys to next generation stack
description: This recipe migrates the Azure keyvault-keys library to the next generation stack.
recipeList:

- com.azure.openrewrite.recipe.azure.security.keyvault.keys
- com.azure.openrewrite.recipe.azure.security.keyvault.keys.models
- com.azure.openrewrite.recipe.azure.security.keyvault.keys.cryptography
- com.azure.openrewrite.recipe.azure.security.keyvault.keys.cryptography.models
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
# --------------------------------------------------------------------
# Migration Recipes for azure.security.keyvault.keys.cryptography.models
# --------------------------------------------------------------------
type: specs.openrewrite.org/v1beta/recipe
name: com.azure.openrewrite.recipe.azure.security.keyvault.keys.cryptography.models
displayName: Migrate from azure.security.keyvault.keys.cryptography.models to next generation stack
description: This recipe migrates the azure.security.keyvault.keys.cryptography.models package to the next generation stack.
recipeList:

# --------------------------------------------------------------------
# DecryptResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.DecryptResult
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.DecryptResult

# --------------------------------------------------------------------
# EncryptResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.EncryptResult
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.EncryptResult

# --------------------------------------------------------------------
# EncryptionAlgorithm
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.EncryptionAlgorithm
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.EncryptionAlgorithm

# --------------------------------------------------------------------
# EncryptResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.KeyWrapAlgorithm
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.KeyWrapAlgorithm

# --------------------------------------------------------------------
# UnwrapResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.UnwrapResult
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.UnwrapResult

# --------------------------------------------------------------------
# WrapResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.WrapResult
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.WrapResult

# --------------------------------------------------------------------
# SignResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.SignResult
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.SignResult

# --------------------------------------------------------------------
# SignatureAlgorithm
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.SignatureAlgorithm
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.SignatureAlgorithm

# --------------------------------------------------------------------
# VerifyResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.models.VerifyResult
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.models.VerifyResult
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
# --------------------------------------------------------------------
# Migration Recipes for azure.security.keyvault.keys.cryptography
# --------------------------------------------------------------------
type: specs.openrewrite.org/v1beta/recipe
name: com.azure.openrewrite.recipe.azure.security.keyvault.keys.cryptography
displayName: Migrate from azure.security.keyvault.keys.cryptography to next generation stack
description: This recipe migrates the azure.security.keyvault.keys.cryptography package to the next generation stack.
recipeList:
# --------------------------------------------------------------------
# DecryptResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.CryptographyClient
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.CryptographyClient

# --------------------------------------------------------------------
# DecryptResult
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.cryptography.CryptographyClientBuilder
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.cryptography.CryptographyClientBuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
type: specs.openrewrite.org/v1beta/recipe
name: com.azure.openrewrite.recipe.azure.security.keyvault.keys.models
displayName: Migrate from azure.security.keyvault.keys.models to next generation stack
description: This recipe migrates the azure.security.keyvault.keys.models package to the next generation stack.
recipeList:

# --------------------------------------------------------------------
# CreateRsaKeyOptions
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.CreateRsaKeyOptions
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.CreateRsaKeyOptions

# --------------------------------------------------------------------
# DeletedKey
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.DeletedKey
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.DeletedKey

# --------------------------------------------------------------------
# KeyVaultKey
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.KeyVaultKey
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.KeyVaultKey

# --------------------------------------------------------------------
# KeyRotationLifetimeAction
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.KeyRotationLifetimeAction
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.KeyRotationLifetimeAction

# --------------------------------------------------------------------
# KeyRotationPolicy
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.KeyRotationPolicy
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.KeyRotationPolicy

# --------------------------------------------------------------------
# KeyRotationPolicyAction
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.KeyRotationPolicyAction
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.KeyRotationPolicyAction

# --------------------------------------------------------------------
# CreateEcKeyOptions
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.CreateEcKeyOptions
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.CreateEcKeyOptions

# --------------------------------------------------------------------
# KeyProperties
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.models.KeyProperties
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.models.KeyProperties
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.
type: specs.openrewrite.org/v1beta/recipe
name: com.azure.openrewrite.recipe.azure.security.keyvault.keys
displayName: Migrate from azure.security.keyvault.keys to next generation stack
description: This recipe migrates the azure.security.keyvault.keys package to the next generation stack.
recipeList:

# --------------------------------------------------------------------
# KeyClientBuilder
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeMethodName:
methodPattern: com.azure.security.keyvault.keys.KeyClientBuilder vaultUrl(..)
newMethodName: endpoint

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.KeyClientBuilder
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.KeyClientBuilder

# --------------------------------------------------------------------
# KeyClient
# --------------------------------------------------------------------

- org.openrewrite.java.ChangeType:
oldFullyQualifiedTypeName: com.azure.security.keyvault.keys.KeyClient
newFullyQualifiedTypeName: com.azure.v2.security.keyvault.keys.KeyClient
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ recipeList:
# Code Migration Recipes
- com.azure.openrewrite.migration.core
- com.azure.openrewrite.migration.identity
- com.azure.openrewrite.migration.security.keyvault.keys

# Code Styling recipes
- org.openrewrite.java.OrderImports:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.security.keyvault.keys;

import com.azure.core.util.polling.PollResponse;
import com.azure.core.util.polling.SyncPoller;
import com.azure.security.keyvault.keys.KeyClient;
import com.azure.security.keyvault.keys.KeyClientBuilder;
import com.azure.security.keyvault.keys.models.DeletedKey;
import com.azure.security.keyvault.keys.models.KeyVaultKey;
import com.azure.security.keyvault.keys.models.CreateRsaKeyOptions;
Expand Down
Loading