Skip to content

Update enum values to be upper case and underscored #34267

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.

Sign up for GitHub

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

Merged
chenrujun merged 3 commits into from
Mar 30, 2023
Merged

Update enum values to be upper case and underscored #34267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1c8fd9
update enum values to be upper case
Mar 30, 2023
5825ee4
revert wrong updates
Mar 30, 2023
1f85547
fix test case error
Mar 30, 2023
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
20 changes: 10 additions & 10 deletions ...ure-core/src/main/java/com/azure/spring/cloud/core/properties/PasswordlessProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,61 +66,61 @@ enum AzurePasswordlessPropertiesMapping {
/**
* Getter function and setter biConsumer for scopes.
*/
scopes(p -> p.getScopes(),
SCOPES(p -> p.getScopes(),
(p, s) -> p.setProperty(AuthProperty.SCOPES.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for clientCertificatePassword.
*/
clientCertificatePassword(p -> p.getCredential().getClientCertificatePassword(),
CLIENT_CERTIFICATE_PASSWORD(p -> p.getCredential().getClientCertificatePassword(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PASSWORD.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for clientCertificatePath.
*/
clientCertificatePath(p -> p.getCredential().getClientCertificatePath(),
CLIENT_CERTIFICATE_PATH(p -> p.getCredential().getClientCertificatePath(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PATH.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for clientId.
*/
clientId(p -> p.getCredential().getClientId(),
CLIENT_ID(p -> p.getCredential().getClientId(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_ID.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for clientSecret.
*/
clientSecret(p -> p.getCredential().getClientSecret(),
CLIENT_SECRET(p -> p.getCredential().getClientSecret(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_SECRET.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for managedIdentityEnabled.
*/
managedIdentityEnabled(p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
MANAGED_IDENTITY_ENABLED(p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
(p, s) -> p.setProperty(AuthProperty.MANAGED_IDENTITY_ENABLED.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for password.
*/
password(p -> p.getCredential().getPassword(),
PASSWORD(p -> p.getCredential().getPassword(),
(p, s) -> p.setProperty(AuthProperty.PASSWORD.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for username.
*/
username(p -> p.getCredential().getUsername(),
USERNAME(p -> p.getCredential().getUsername(),
(p, s) -> p.setProperty(AuthProperty.USERNAME.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for tenantId.
*/
tenantId(p -> p.getProfile().getTenantId(),
TENANT_ID(p -> p.getProfile().getTenantId(),
(p, s) -> p.setProperty(AuthProperty.TENANT_ID.getPropertyKey(), s)),

/**
* Getter function and setter biConsumer for authorityHost.
*/
authorityHost(p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
AUTHORITY_HOST(p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
(p, s) -> p.setProperty(AuthProperty.AUTHORITY_HOST.getPropertyKey(), s));

private Function<PasswordlessProperties, String> getter;
Expand Down
58 changes: 29 additions & 29 deletions ...n/java/com/azure/spring/cloud/service/implementation/kafka/AzureKafkaPropertiesUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,119 +44,119 @@ public static void copyJaasPropertyToAzureProperties(String source, AzurePasswor

public enum AzureKafkaPasswordlessPropertiesMapping {

clientCertificatePassword(CREDENTIAL_PREFIX + "client-certificate-password",
CLIENT_CERTIFICATE_PASSWORD(CREDENTIAL_PREFIX + "client-certificate-password",
p -> p.getCredential().getClientCertificatePassword(),
(p, s) -> p.getCredential().setClientCertificatePassword(s)),

clientCertificatePath(CREDENTIAL_PREFIX + "client-certificate-path",
CLIENT_CERTIFICATE_PATH(CREDENTIAL_PREFIX + "client-certificate-path",
p -> p.getCredential().getClientCertificatePath(),
(p, s) -> p.getCredential().setClientCertificatePath(s)),

clientId(CREDENTIAL_PREFIX + "client-id",
CLIENT_ID(CREDENTIAL_PREFIX + "client-id",
p -> p.getCredential().getClientId(),
(p, s) -> p.getCredential().setClientId(s)),

clientSecret(CREDENTIAL_PREFIX + "client-secret",
CLIENT_SECRET(CREDENTIAL_PREFIX + "client-secret",
p -> p.getCredential().getClientSecret(),
(p, s) -> p.getCredential().setClientSecret(s)),

managedIdentityEnabled(CREDENTIAL_PREFIX + "managed-identity-enabled",
MANAGED_IDENTITY_ENABLED(CREDENTIAL_PREFIX + "managed-identity-enabled",
p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
(p, s) -> p.getCredential().setManagedIdentityEnabled(Boolean.valueOf(s))),

password(CREDENTIAL_PREFIX + "password",
PASSWORD(CREDENTIAL_PREFIX + "password",
p -> p.getCredential().getPassword(),
(p, s) -> p.getCredential().setPassword(s)),

username(CREDENTIAL_PREFIX + "username",
USERNAME(CREDENTIAL_PREFIX + "username",
p -> p.getCredential().getUsername(),
(p, s) -> p.getCredential().setUsername(s)),

cloudType(PROFILE_PREFIX + "cloud-type",
CLOUD_TYPE(PROFILE_PREFIX + "cloud-type",
p -> Optional.ofNullable(p.getProfile().getCloudType()).map(v -> v.name()).orElse(null),
(p, s) -> p.getProfile().setCloudType(AzureProfileOptionsProvider.CloudType.fromString(s))),

activeDirectoryEndpoint(ENVIRONMENT_PREFIX + "active-directory-endpoint",
ACTIVE_DIRECTORY_ENDPOINT(ENVIRONMENT_PREFIX + "active-directory-endpoint",
p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setActiveDirectoryEndpoint(s)),

activeDirectoryGraphApiVersion(ENVIRONMENT_PREFIX + "active-directory-graph-api-version",
ACTIVE_DIRECTORY_GRAPH_API_VERSION(ENVIRONMENT_PREFIX + "active-directory-graph-api-version",
p -> p.getProfile().getEnvironment().getActiveDirectoryGraphApiVersion(),
(p, s) -> p.getProfile().getEnvironment().setActiveDirectoryGraphApiVersion(s)),

activeDirectoryGraphEndpoint(ENVIRONMENT_PREFIX + "active-directory-graph-endpoint",
ACTIVE_DIRECTORY_GRAPH_ENDPOINT(ENVIRONMENT_PREFIX + "active-directory-graph-endpoint",
p -> p.getProfile().getEnvironment().getActiveDirectoryGraphEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setActiveDirectoryGraphEndpoint(s)),

activeDirectoryResourceId(ENVIRONMENT_PREFIX + "active-directory-resource-id",
ACTIVE_DIRECTORY_RESOURCE_ID(ENVIRONMENT_PREFIX + "active-directory-resource-id",
p -> p.getProfile().getEnvironment().getActiveDirectoryResourceId(),
(p, s) -> p.getProfile().getEnvironment().setActiveDirectoryResourceId(s)),

azureApplicationInsightsEndpoint(ENVIRONMENT_PREFIX + "azure-application-insights-endpoint",
AZURE_APPLICATION_INSIGHTS_ENDPOINT(ENVIRONMENT_PREFIX + "azure-application-insights-endpoint",
p -> p.getProfile().getEnvironment().getAzureApplicationInsightsEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setAzureApplicationInsightsEndpoint(s)),

azureDataLakeAnalyticsCatalogAndJobEndpointSuffix(ENVIRONMENT_PREFIX + "azure-data-lake-analytics-catalog-and-job-endpoint-suffix",
AZURE_DATA_LAKE_ANALYTICS_CATALOG_AND_JOB_ENDPOINT_SUFFIX(ENVIRONMENT_PREFIX + "azure-data-lake-analytics-catalog-and-job-endpoint-suffix",
p -> p.getProfile().getEnvironment().getAzureDataLakeAnalyticsCatalogAndJobEndpointSuffix(),
(p, s) -> p.getProfile().getEnvironment().setAzureDataLakeAnalyticsCatalogAndJobEndpointSuffix(s)),

azureDataLakeStoreFileSystemEndpointSuffix(ENVIRONMENT_PREFIX + "azure-data-lake-store-file-system-endpoint-suffix",
AZURE_DATA_LAKE_STORE_FILE_SYSTEM_ENDPOINT_SUFFIX(ENVIRONMENT_PREFIX + "azure-data-lake-store-file-system-endpoint-suffix",
p -> p.getProfile().getEnvironment().getAzureDataLakeStoreFileSystemEndpointSuffix(),
(p, s) -> p.getProfile().getEnvironment().setAzureDataLakeStoreFileSystemEndpointSuffix(s)),

azureLogAnalyticsEndpoint(ENVIRONMENT_PREFIX + "azure-log-analytics-endpoint",
AZURE_LOG_ANALYTICS_ENDPOINT(ENVIRONMENT_PREFIX + "azure-log-analytics-endpoint",
p -> p.getProfile().getEnvironment().getAzureLogAnalyticsEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setAzureLogAnalyticsEndpoint(s)),

dataLakeEndpointResourceId(ENVIRONMENT_PREFIX + "data-lake-endpoint-resource-id",
DATA_LAKE_ENDPOINT_RESOURCE_ID(ENVIRONMENT_PREFIX + "data-lake-endpoint-resource-id",
p -> p.getProfile().getEnvironment().getDataLakeEndpointResourceId(),
(p, s) -> p.getProfile().getEnvironment().setDataLakeEndpointResourceId(s)),

galleryEndpoint(ENVIRONMENT_PREFIX + "gallery-endpoint",
GALLERY_ENDPOINT(ENVIRONMENT_PREFIX + "gallery-endpoint",
p -> p.getProfile().getEnvironment().getGalleryEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setGalleryEndpoint(s)),

keyVaultDnsSuffix(ENVIRONMENT_PREFIX + "key-vault-dns-suffix",
KEY_VAULT_DNS_SUFFIX(ENVIRONMENT_PREFIX + "key-vault-dns-suffix",
p -> p.getProfile().getEnvironment().getKeyVaultDnsSuffix(),
(p, s) -> p.getProfile().getEnvironment().setKeyVaultDnsSuffix(s)),

managementEndpoint(ENVIRONMENT_PREFIX + "management-endpoint",
MANAGEMENT_ENDPOINT(ENVIRONMENT_PREFIX + "management-endpoint",
p -> p.getProfile().getEnvironment().getManagementEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setManagementEndpoint(s)),

microsoftGraphEndpoint(ENVIRONMENT_PREFIX + "microsoft-graph-endpoint",
MICROSOFT_GRAPH_ENDPOINT(ENVIRONMENT_PREFIX + "microsoft-graph-endpoint",
p -> p.getProfile().getEnvironment().getMicrosoftGraphEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setMicrosoftGraphEndpoint(s)),

portal(ENVIRONMENT_PREFIX + "portal",
PORTAL(ENVIRONMENT_PREFIX + "portal",
p -> p.getProfile().getEnvironment().getPortal(),
(p, s) -> p.getProfile().getEnvironment().setPortal(s)),

publishingProfile(ENVIRONMENT_PREFIX + "publishing-profile",
PUBLISHING_PROFILE(ENVIRONMENT_PREFIX + "publishing-profile",
p -> p.getProfile().getEnvironment().getPublishingProfile(),
(p, s) -> p.getProfile().getEnvironment().setPublishingProfile(s)),

resourceManagerEndpoint(ENVIRONMENT_PREFIX + "resource-manager-endpoint",
RESOURCE_MANAGER_ENDPOINT(ENVIRONMENT_PREFIX + "resource-manager-endpoint",
p -> p.getProfile().getEnvironment().getResourceManagerEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setResourceManagerEndpoint(s)),

sqlManagementEndpoint(ENVIRONMENT_PREFIX + "sql-management-endpoint",
SQL_MANAGEMENT_ENDPOINT(ENVIRONMENT_PREFIX + "sql-management-endpoint",
p -> p.getProfile().getEnvironment().getSqlManagementEndpoint(),
(p, s) -> p.getProfile().getEnvironment().setSqlManagementEndpoint(s)),

sqlServerHostnameSuffix(ENVIRONMENT_PREFIX + "sql-server-hostname-suffix",
SQL_SERVER_HOSTNAME_SUFFIX(ENVIRONMENT_PREFIX + "sql-server-hostname-suffix",
p -> p.getProfile().getEnvironment().getSqlServerHostnameSuffix(),
(p, s) -> p.getProfile().getEnvironment().setSqlServerHostnameSuffix(s)),

storageEndpointSuffix(ENVIRONMENT_PREFIX + "storage-endpoint-suffix",
STORAGE_ENDPOINT_SUFFIX(ENVIRONMENT_PREFIX + "storage-endpoint-suffix",
p -> p.getProfile().getEnvironment().getStorageEndpointSuffix(),
(p, s) -> p.getProfile().getEnvironment().setStorageEndpointSuffix(s)),

subscriptionId(PROFILE_PREFIX + "subscription-id",
SUBSCRIPTION_ID(PROFILE_PREFIX + "subscription-id",
p -> p.getProfile().getSubscriptionId(),
(p, s) -> p.getProfile().setSubscriptionId(s)),

tenantId(PROFILE_PREFIX + "tenant-id",
TENANT_ID(PROFILE_PREFIX + "tenant-id",
p -> p.getProfile().getTenantId(),
(p, s) -> p.getProfile().setTenantId(s));

Expand Down
20 changes: 10 additions & 10 deletions ...m/azure/spring/cloud/service/implementation/passwordless/AzurePasswordlessProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,34 +101,34 @@ public Properties toProperties() {

private enum AzurePasswordlessPropertiesMapping {

scopes(p -> p.getScopes(),
SCOPES(p -> p.getScopes(),
(p, s) -> p.setProperty(AuthProperty.SCOPES.getPropertyKey(), s)),

clientCertificatePassword(p -> p.getCredential().getClientCertificatePassword(),
CLIENT_CERTIFICATE_PASSWORD(p -> p.getCredential().getClientCertificatePassword(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PASSWORD.getPropertyKey(), s)),

clientCertificatePath(p -> p.getCredential().getClientCertificatePath(),
CLIENT_CERTIFICATE_PATH(p -> p.getCredential().getClientCertificatePath(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PATH.getPropertyKey(), s)),

clientId(p -> p.getCredential().getClientId(),
CLIENT_ID(p -> p.getCredential().getClientId(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_ID.getPropertyKey(), s)),

clientSecret(p -> p.getCredential().getClientSecret(),
CLIENT_SECRET(p -> p.getCredential().getClientSecret(),
(p, s) -> p.setProperty(AuthProperty.CLIENT_SECRET.getPropertyKey(), s)),

managedIdentityEnabled(p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
MANAGED_IDENTITY_ENABLED(p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
(p, s) -> p.setProperty(AuthProperty.MANAGED_IDENTITY_ENABLED.getPropertyKey(), s)),

password(p -> p.getCredential().getPassword(),
PASSWORD(p -> p.getCredential().getPassword(),
(p, s) -> p.setProperty(AuthProperty.PASSWORD.getPropertyKey(), s)),

username(p -> p.getCredential().getUsername(),
USERNAME(p -> p.getCredential().getUsername(),
(p, s) -> p.setProperty(AuthProperty.USERNAME.getPropertyKey(), s)),

tenantId(p -> p.getProfile().getTenantId(),
TENANT_ID(p -> p.getProfile().getTenantId(),
(p, s) -> p.setProperty(AuthProperty.TENANT_ID.getPropertyKey(), s)),

authorityHost(p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
AUTHORITY_HOST(p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
(p, s) -> p.setProperty(AuthProperty.AUTHORITY_HOST.getPropertyKey(), s));

private Function<AzurePasswordlessProperties, String> getter;
Expand Down
4 changes: 2 additions & 2 deletions ...spring/cloud/service/implementation/kafka/KafkaOAuth2AuthenticateCallbackHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Map;

import static com.azure.spring.cloud.service.implementation.kafka.AzureKafkaPropertiesUtils.AZURE_TOKEN_CREDENTIAL;
import static com.azure.spring.cloud.service.implementation.kafka.AzureKafkaPropertiesUtils.AzureKafkaPasswordlessPropertiesMapping.managedIdentityEnabled;
import static com.azure.spring.cloud.service.implementation.kafka.AzureKafkaPropertiesUtils.AzureKafkaPasswordlessPropertiesMapping.MANAGED_IDENTITY_ENABLED;
import static com.azure.spring.cloud.service.implementation.kafka.AzureOAuthBearerTokenTest.FAKE_TOKEN;
import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
import static org.apache.kafka.common.config.SaslConfigs.SASL_JAAS_CONFIG;
Expand Down Expand Up @@ -87,7 +87,7 @@ void testCreateTokenCredentialByResolver() {
Map<String, Object> configs = new HashMap<>();
configs.put(BOOTSTRAP_SERVERS_CONFIG, KAFKA_BOOTSTRAP_SERVER);
Jaas jaas = new Jaas(OAuthBearerLoginModule.class.getName());
jaas.getOptions().put(managedIdentityEnabled.propertyKey(), "true");
jaas.getOptions().put(MANAGED_IDENTITY_ENABLED.propertyKey(), "true");
configs.put(SASL_JAAS_CONFIG, new Password(jaas.toString()));

KafkaOAuth2AuthenticateCallbackHandler handler = new KafkaOAuth2AuthenticateCallbackHandler();
Expand Down