Skip to content

Commit 4a0aaee

Browse files
authored
feat(codecatalyst): Use MDE endpoint set by environment variable (#3997)
1 parent 53e5ebd commit 4a0aaee

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
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" : "Use MDE endpoint set by environment variable"
4+
}

jetbrains-core/resources/META-INF/services/caws.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<extensions defaultExtensionNs="com.intellij">
88
<projectService serviceImplementation="software.aws.toolkits.jetbrains.core.credentials.sono.SonoCredentialManager"/>
99
<applicationService serviceImplementation="software.aws.toolkits.jetbrains.core.credentials.sono.SonoCredentialManager"/>
10-
<applicationService serviceImplementation="software.aws.toolkits.jetbrains.services.caws.envclient.CawsEnvironmentClient"/>
1110
<applicationService serviceImplementation="software.aws.toolkits.jetbrains.settings.CawsSpaceTracker"/>
1211
<projectService serviceImplementation="software.aws.toolkits.jetbrains.services.caws.projectstate.CawsProjectSettings"/>
1312
</extensions>

jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsConstants.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ package software.aws.toolkits.jetbrains.services.caws
66
object CawsConstants {
77
const val CAWS_ENV_PROJECT_DIR = "/projects"
88
const val CAWS_ENV_IDE_BACKEND_DIR = "/aws/mde/ide-runtimes/jetbrains/runtime/"
9+
const val DEFAULT_CAWS_ENV_API_ENDPOINT = "http://127.0.0.1:1339"
10+
const val CAWS_ENV_API_ENDPOINT = "__MDE_ENVIRONMENT_API"
911
const val CAWS_ENV_AUTH_TOKEN_VAR = "__MDE_ENV_API_AUTHORIZATION_TOKEN"
1012
const val CAWS_ENV_ORG_NAME_VAR = "__DEV_ENVIRONMENT_ORGANIZATION_NAME"
1113
const val CAWS_ENV_PROJECT_NAME_VAR = "__DEV_ENVIRONMENT_PROJECT_NAME"

jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/CawsEnvironmentClient.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import com.fasterxml.jackson.databind.DeserializationFeature
77
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
88
import com.fasterxml.jackson.module.kotlin.readValue
99
import com.intellij.openapi.Disposable
10+
import com.intellij.openapi.components.Service
1011
import com.intellij.openapi.components.service
12+
import com.intellij.util.text.nullize
1113
import org.apache.http.client.methods.CloseableHttpResponse
1214
import org.apache.http.client.methods.HttpGet
1315
import org.apache.http.client.methods.HttpPost
@@ -19,6 +21,7 @@ import org.apache.http.impl.client.CloseableHttpClient
1921
import org.apache.http.impl.client.HttpClientBuilder
2022
import software.aws.toolkits.core.utils.error
2123
import software.aws.toolkits.core.utils.getLogger
24+
import software.aws.toolkits.core.utils.info
2225
import software.aws.toolkits.jetbrains.services.caws.CawsConstants
2326
import software.aws.toolkits.jetbrains.services.caws.envclient.models.CreateDevfileRequest
2427
import software.aws.toolkits.jetbrains.services.caws.envclient.models.CreateDevfileResponse
@@ -29,10 +32,15 @@ import software.aws.toolkits.jetbrains.services.caws.envclient.models.UpdateActi
2932
import software.aws.toolkits.jetbrains.utils.notifyError
3033
import software.aws.toolkits.resources.message
3134

35+
@Service
3236
class CawsEnvironmentClient(
33-
private val endpoint: String = "http://127.0.0.1:1339",
37+
private val endpoint: String = System.getenv(CawsConstants.CAWS_ENV_API_ENDPOINT).nullize(true) ?: CawsConstants.DEFAULT_CAWS_ENV_API_ENDPOINT,
3438
private val httpClient: CloseableHttpClient = HttpClientBuilder.create().build()
3539
) : Disposable {
40+
init {
41+
LOG.info { "Initialized with endpoint: $endpoint" }
42+
}
43+
3644
private val objectMapper = jacksonObjectMapper().also {
3745
it.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE)
3846
it.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)

0 commit comments

Comments
 (0)