Skip to content

Commit bed2665

Browse files
authored
Merge pull request #3972 from aws/feature/gettingstarted
Merge Getting Started flow into main
2 parents a813e14 + 74576e7 commit bed2665

File tree

92 files changed

+5871
-973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5871
-973
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Added the 'Setup Authentication for AWS Toolkit' page"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "auth: support `sso_session` for profiles in AWS shared ini files"
4+
}

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ tasks.runIde {
170170
systemProperty("aws.toolkit.developerMode", true)
171171
systemProperty("ide.plugins.snapshot.on.unload.fail", true)
172172
systemProperty("memory.snapshots.path", project.rootDir)
173+
systemProperty("idea.auto.reload.plugins", false)
173174

174175
val alternativeIde = providers.environmentVariable("ALTERNATIVE_IDE")
175176
if (alternativeIde.isPresent) {

core/src/software/aws/toolkits/core/credentials/CredentialsChangeEvent.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ package software.aws.toolkits.core.credentials
88
* to give an accurate representation of the state of the credentials system
99
*/
1010
data class CredentialsChangeEvent(
11-
val added: List<CredentialIdentifier>,
12-
val modified: List<CredentialIdentifier>,
13-
val removed: List<CredentialIdentifier>
11+
val added: List<CredentialIdentifier> = emptyList(),
12+
val modified: List<CredentialIdentifier> = emptyList(),
13+
val removed: List<CredentialIdentifier> = emptyList(),
14+
15+
val ssoAdded: List<SsoSessionIdentifier> = emptyList(),
16+
val ssoModified: List<SsoSessionIdentifier> = emptyList(),
17+
val ssoRemoved: List<SsoSessionIdentifier> = emptyList()
1418
)
1519

1620
typealias CredentialsChangeListener = (changeEvent: CredentialsChangeEvent) -> Unit

core/src/software/aws/toolkits/core/credentials/ToolkitCredentialsProvider.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ interface CredentialIdentifier {
6565
val defaultRegionId: String? get() = null
6666
}
6767

68+
interface SsoSessionBackedCredentialIdentifier {
69+
val sessionIdentifier: String
70+
}
71+
72+
interface SsoSessionIdentifier {
73+
val id: String
74+
val startUrl: String
75+
val ssoRegion: String
76+
val scopes: Set<String>
77+
}
78+
6879
abstract class CredentialIdentifierBase(override val credentialType: CredentialType?) : CredentialIdentifier {
6980
final override fun equals(other: Any?): Boolean {
7081
if (this === other) return true

core/src/software/aws/toolkits/core/credentials/ToolkitCredentialsProviderManager.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ interface ToolkitCredentialsChangeListener {
1111
fun providerModified(identifier: CredentialIdentifier) {}
1212
fun providerRemoved(identifier: CredentialIdentifier) {}
1313
fun providerRemoved(providerId: String) {}
14+
15+
fun ssoSessionAdded(identifier: SsoSessionIdentifier) {}
16+
fun ssoSessionModified(identifier: SsoSessionIdentifier) {}
17+
fun ssoSessionRemoved(identifier: SsoSessionIdentifier) {}
1418
}
1519

1620
class CredentialProviderNotFoundException : RuntimeException {

core/src/software/aws/toolkits/core/utils/PathUtils.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ fun Path.deleteIfExists() = Files.deleteIfExists(this)
5757
fun Path.lastModified(): FileTime = Files.getLastModifiedTime(this)
5858
fun Path.readText(charset: Charset = Charsets.UTF_8) = toFile().readText(charset)
5959
fun Path.writeText(text: String, charset: Charset = Charsets.UTF_8) = toFile().writeText(text, charset)
60+
fun Path.appendText(text: String, charset: Charset = Charsets.UTF_8) = toFile().appendText(text, charset)
6061

6162
// Comes from PosixFileAttributeView#name()
6263
fun Path.hasPosixFilePermissions() = "posix" in this.fileSystem.supportedFileAttributeViews()

jetbrains-core/assets/WelcomeToCodeWhisperer.md

Lines changed: 0 additions & 51 deletions
This file was deleted.
83.3 KB
Loading
130 KB
Loading

0 commit comments

Comments
 (0)