Skip to content

Commit 0ae59d2

Browse files
authored
Merge feature/apprunner - Add App Runner features (#2609)
Add AppRunner features
1 parent f70f418 commit 0ae59d2

Some content is hidden

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

50 files changed

+2195
-43
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" : "Add support for AppRunner. Create/delete/pause/resume/deploy and view logs for your AppRunner services."
4+
}

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ allprojects {
2626
}
2727
}
2828
}
29-
gradlePluginPortal()
3029
mavenCentral()
30+
gradlePluginPortal()
3131
}
3232
}
3333

buildSrc/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
1414
}
1515
}
1616
}
17-
gradlePluginPortal()
1817
mavenCentral()
18+
gradlePluginPortal()
1919
}
2020
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ ideProfileName=2020.2
1212

1313
# Common dependencies
1414
kotlinVersion=1.4.21
15-
awsSdkVersion=2.16.36
15+
awsSdkVersion=2.16.65
1616
coroutinesVersion=1.3.3
1717
detektVersion=1.16.0
1818
jacksonVersion=2.11.1
19-
telemetryVersion=1.0.3
19+
telemetryVersion=1.0.5
2020
commonsMarkVersion=0.17.1
2121
jgitVersion=5.11.0.202103091610-r
2222

jetbrains-core/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ dependencies {
8181
api("software.amazon.awssdk:secretsmanager:$awsSdkVersion")
8282
api("software.amazon.awssdk:sns:$awsSdkVersion")
8383
api("software.amazon.awssdk:sqs:$awsSdkVersion")
84+
api("software.amazon.awssdk:apprunner:$awsSdkVersion")
8485
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
8586

8687
testImplementation(project(path = ":core", configuration = "testArtifacts"))

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ with what features/services are supported.
244244
<notice implementation="software.aws.toolkits.jetbrains.core.notification.JetBrainsMinimumVersionChange"/>
245245

246246
<!-- Explorer nodes -->
247+
<explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.AppRunnerExplorerRootNode"/>
247248
<explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.CloudFormationExplorerRootNode"/>
248249
<explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.CloudWatchRootNode"/>
249250
<explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.DynamoDbExplorerRootNode"/>
@@ -290,6 +291,23 @@ with what features/services are supported.
290291
<separator/>
291292
</group>
292293

294+
<group id="aws.toolkit.explorer.apprunner" popup="true" compact="false">
295+
<action id="apprunner.service.create" class="software.aws.toolkits.jetbrains.services.apprunner.actions.CreateServiceAction"/>
296+
</group>
297+
298+
<group id="aws.toolkit.explorer.apprunner.service" popup="true" compact="false">
299+
<action id="apprunner.service.deploy" class="software.aws.toolkits.jetbrains.services.apprunner.actions.DeployAction"/>
300+
<action id="apprunner.service.pause" class="software.aws.toolkits.jetbrains.services.apprunner.actions.PauseServiceAction"/>
301+
<action id="apprunner.service.resume" class="software.aws.toolkits.jetbrains.services.apprunner.actions.ResumeServiceAction"/>
302+
<separator/>
303+
<action id="apprunner.service.copyServiceUri" class="software.aws.toolkits.jetbrains.services.apprunner.actions.CopyServiceUrlAction"/>
304+
<separator/>
305+
<action id="apprunner.service.showSystemLogs" class="software.aws.toolkits.jetbrains.services.apprunner.actions.ViewSystemLogsAction"/>
306+
<action id="apprunner.service.showApplicationLogs" class="software.aws.toolkits.jetbrains.services.apprunner.actions.ViewApplicationLogsAction"/>
307+
<separator/>
308+
<action id="apprunner.service.delete" class="software.aws.toolkits.jetbrains.services.apprunner.actions.DeleteServiceAction"/>
309+
</group>
310+
293311
<group id="aws.toolkit.explorer.lambda" popup="true" compact="false">
294312
<action id="lambda.function.create" class="software.aws.toolkits.jetbrains.services.lambda.upload.CreateLambdaFunctionAction"/>
295313
</group>
Lines changed: 9 additions & 0 deletions
Loading
Lines changed: 9 additions & 0 deletions
Loading

jetbrains-core/src/icons/AwsIcons.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ object AwsIcons {
2525
}
2626

2727
object Resources {
28+
@JvmField val APPRUNNER_SERVICE = load("/icons/resources/AppRunnerService.svg") // 16x16
2829
@JvmField val CLOUDFORMATION_STACK = load("/icons/resources/CloudFormationStack.svg") // 16x16
2930
object CloudWatch {
3031
@JvmField val LOGS = load("/icons/resources/cloudwatchlogs/CloudWatchLogs.svg") // 16x16
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package software.aws.toolkits.jetbrains.core.explorer.nodes
5+
6+
import com.intellij.openapi.project.Project
7+
import software.amazon.awssdk.services.apprunner.AppRunnerClient
8+
import software.aws.toolkits.jetbrains.services.apprunner.AppRunnerNode
9+
10+
class AppRunnerExplorerRootNode : AwsExplorerServiceNode {
11+
override val serviceId: String = AppRunnerClient.SERVICE_NAME
12+
13+
override fun buildServiceRootNode(project: Project) = AppRunnerNode(project, this)
14+
}

0 commit comments

Comments
 (0)