Enable SSO by default (#2076)

Author: hunterwerlla

.changes/next-release/feature-7af5f19a-45df-4a91-8a80-545cd23e1623.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support for AWS SSO based credential profiles"
+}

core/src/software/aws/toolkits/core/credentials/sso/SsoProfileProperty.kt

@@ -7,5 +7,3 @@ const val SSO_URL = "sso_start_url"
 const val SSO_REGION = "sso_region"
 const val SSO_ACCOUNT = "sso_account_id"
 const val SSO_ROLE_NAME = "sso_role_name"
-
-const val SSO_EXPERIMENTAL_REGISTRY_KEY = "aws.sso.enabled"

jetbrains-core/resources/META-INF/plugin.xml

@@ -222,7 +222,6 @@
         <fileEditorProvider implementation="software.aws.toolkits.jetbrains.services.s3.S3ViewerEditorProvider"/>
         <!-- See this post why order="first" is required https://intellij-support.jetbrains.com/hc/en-us/community/posts/360003460619-fileIconProvider-is-not-showing-Icon-for-custom-LightVirtualFile -->
         <fileIconProvider order="first" implementation="software.aws.toolkits.jetbrains.services.s3.editor.S3FileIconProvider"/>
-        <registryKey key="aws.sso.enabled" description="(Experimental) Enable SSO AWS Credentials" restartRequired="true" defaultValue="false"/>
         <registryKey key="aws.credentialProcess.timeout" description="AWS Credential Process timeout (ms)" restartRequired="false" defaultValue="30000"/>
     </extensions>
 

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactory.kt

@@ -4,7 +4,6 @@
 package software.aws.toolkits.jetbrains.core.credentials.profiles
 
 import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.util.registry.Registry
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
@@ -26,7 +25,6 @@ import software.aws.toolkits.core.credentials.CredentialProviderFactory
 import software.aws.toolkits.core.credentials.CredentialsChangeEvent
 import software.aws.toolkits.core.credentials.CredentialsChangeListener
 import software.aws.toolkits.core.credentials.sso.SSO_ACCOUNT
-import software.aws.toolkits.core.credentials.sso.SSO_EXPERIMENTAL_REGISTRY_KEY
 import software.aws.toolkits.core.credentials.sso.SSO_REGION
 import software.aws.toolkits.core.credentials.sso.SSO_ROLE_NAME
 import software.aws.toolkits.core.credentials.sso.SSO_URL
@@ -186,7 +184,7 @@ class ProfileCredentialProviderFactory : CredentialProviderFactory {
     }
 
     private fun createAwsCredentialProvider(profile: Profile, region: AwsRegion, sdkHttpClientSupplier: () -> SdkHttpClient) = when {
-        profile.propertyExists(SSO_URL) && Registry.`is`(SSO_EXPERIMENTAL_REGISTRY_KEY) -> createSsoProvider(profile, sdkHttpClientSupplier)
+        profile.propertyExists(SSO_URL) -> createSsoProvider(profile, sdkHttpClientSupplier)
         profile.propertyExists(ProfileProperty.ROLE_ARN) -> createAssumeRoleProvider(profile, region, sdkHttpClientSupplier)
         profile.propertyExists(ProfileProperty.AWS_SESSION_TOKEN) -> createStaticSessionProvider(profile)
         profile.propertyExists(ProfileProperty.AWS_ACCESS_KEY_ID) -> createBasicProvider(profile)

jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileReader.kt

@@ -3,12 +3,10 @@
 
 package software.aws.toolkits.jetbrains.core.credentials.profiles
 
-import com.intellij.openapi.util.registry.Registry
 import software.amazon.awssdk.profiles.Profile
 import software.amazon.awssdk.profiles.ProfileFile
 import software.amazon.awssdk.profiles.ProfileProperty
 import software.aws.toolkits.core.credentials.sso.SSO_ACCOUNT
-import software.aws.toolkits.core.credentials.sso.SSO_EXPERIMENTAL_REGISTRY_KEY
 import software.aws.toolkits.core.credentials.sso.SSO_REGION
 import software.aws.toolkits.core.credentials.sso.SSO_ROLE_NAME
 import software.aws.toolkits.core.credentials.sso.SSO_URL
@@ -39,7 +37,7 @@ fun validateAndGetProfiles(): Profiles {
 
 private fun validateProfile(profile: Profile, allProfiles: Map<String, Profile>) {
     when {
-        profile.propertyExists(SSO_URL) && Registry.`is`(SSO_EXPERIMENTAL_REGISTRY_KEY) -> validateSsoProfile(profile)
+        profile.propertyExists(SSO_URL) -> validateSsoProfile(profile)
         profile.propertyExists(ProfileProperty.ROLE_ARN) -> validateAssumeRoleProfile(profile, allProfiles)
         profile.propertyExists(ProfileProperty.AWS_SESSION_TOKEN) -> validateStaticSessionProfile(profile)
         profile.propertyExists(ProfileProperty.AWS_ACCESS_KEY_ID) -> validateBasicProfile(profile)