Skip to content

Commit 2b858dc

Browse files
DevelopmentCatsDevelopmentCats
authored
Merge branch 'main' into cat/tf-test-ci-rework
2 parents a2b8378 + 2168360 commit 2b858dc

File tree

17 files changed

+112
-36
lines changed

17 files changed

+112
-36
lines changed

‎registry/coder-labs/modules/auggie/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run Auggie CLI in your workspace to access Augment's AI coding assistant with ad
1313
```tf
1414
module "auggie" {
1515
source = "registry.coder.com/coder-labs/auggie/coder"
16-
version = "0.2.0"
16+
version = "0.2.1"
1717
agent_id = coder_agent.example.id
1818
folder = "/home/coder/project"
1919
}
@@ -47,7 +47,7 @@ module "coder-login" {
4747
4848
module "auggie" {
4949
source = "registry.coder.com/coder-labs/auggie/coder"
50-
version = "0.2.0"
50+
version = "0.2.1"
5151
agent_id = coder_agent.example.id
5252
folder = "/home/coder/project"
5353
@@ -103,7 +103,7 @@ EOF
103103
```tf
104104
module "auggie" {
105105
source = "registry.coder.com/coder-labs/auggie/coder"
106-
version = "0.2.0"
106+
version = "0.2.1"
107107
agent_id = coder_agent.example.id
108108
folder = "/home/coder/project"
109109

‎registry/coder-labs/modules/auggie/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,15 @@ locals {
174174
install_script = file("${path.module}/scripts/install.sh")
175175
start_script = file("${path.module}/scripts/start.sh")
176176
module_dir_name = ".auggie-module"
177+
folder = trimsuffix(var.folder, "/")
177178
}
178179

179180
module "agentapi" {
180181
source = "registry.coder.com/coder/agentapi/coder"
181182
version = "1.2.0"
182183

183184
agent_id = var.agent_id
185+
folder = local.folder
184186
web_app_slug = local.app_slug
185187
web_app_order = var.order
186188
web_app_group = var.group

‎registry/coder-labs/modules/cursor-cli/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run the Cursor Agent CLI in your workspace for interactive coding assistance and
1313
```tf
1414
module "cursor_cli" {
1515
source = "registry.coder.com/coder-labs/cursor-cli/coder"
16-
version = "0.2.0"
16+
version = "0.2.1"
1717
agent_id = coder_agent.example.id
1818
folder = "/home/coder/project"
1919
}
@@ -42,7 +42,7 @@ module "coder-login" {
4242
4343
module "cursor_cli" {
4444
source = "registry.coder.com/coder-labs/cursor-cli/coder"
45-
version = "0.2.0"
45+
version = "0.2.1"
4646
agent_id = coder_agent.example.id
4747
folder = "/home/coder/project"
4848

‎registry/coder-labs/modules/cursor-cli/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ locals {
113113
install_script = file("${path.module}/scripts/install.sh")
114114
start_script = file("${path.module}/scripts/start.sh")
115115
module_dir_name = ".cursor-cli-module"
116+
folder = trimsuffix(var.folder, "/")
116117
}
117118

118119
# Expose status slug and API key to the agent environment
@@ -134,6 +135,7 @@ module "agentapi" {
134135
version = "1.2.0"
135136

136137
agent_id = var.agent_id
138+
folder = local.folder
137139
web_app_slug = local.app_slug
138140
web_app_order = var.order
139141
web_app_group = var.group

‎registry/coder-labs/modules/gemini/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run [Gemini CLI](https://github.com/google-gemini/gemini-cli) in your workspace
1313
```tf
1414
module "gemini" {
1515
source = "registry.coder.com/coder-labs/gemini/coder"
16-
version = "2.1.0"
16+
version = "2.1.1"
1717
agent_id = coder_agent.example.id
1818
folder = "/home/coder/project"
1919
}
@@ -46,7 +46,7 @@ variable "gemini_api_key" {
4646
4747
module "gemini" {
4848
source = "registry.coder.com/coder-labs/gemini/coder"
49-
version = "2.1.0"
49+
version = "2.1.1"
5050
agent_id = coder_agent.example.id
5151
gemini_api_key = var.gemini_api_key
5252
folder = "/home/coder/project"
@@ -94,7 +94,7 @@ data "coder_parameter" "ai_prompt" {
9494
module "gemini" {
9595
count = data.coder_workspace.me.start_count
9696
source = "registry.coder.com/coder-labs/gemini/coder"
97-
version = "2.1.0"
97+
version = "2.1.1"
9898
agent_id = coder_agent.example.id
9999
gemini_api_key = var.gemini_api_key
100100
gemini_model = "gemini-2.5-flash"
@@ -118,7 +118,7 @@ For enterprise users who prefer Google's Vertex AI platform:
118118
```tf
119119
module "gemini" {
120120
source = "registry.coder.com/coder-labs/gemini/coder"
121-
version = "2.1.0"
121+
version = "2.1.1"
122122
agent_id = coder_agent.example.id
123123
gemini_api_key = var.gemini_api_key
124124
folder = "/home/coder/project"

‎registry/coder-labs/modules/gemini/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,15 @@ EOT
172172
install_script = file("${path.module}/scripts/install.sh")
173173
start_script = file("${path.module}/scripts/start.sh")
174174
module_dir_name = ".gemini-module"
175+
folder = trimsuffix(var.folder, "/")
175176
}
176177

177178
module "agentapi" {
178179
source = "registry.coder.com/coder/agentapi/coder"
179180
version = "1.2.0"
180181

181182
agent_id = var.agent_id
183+
folder = local.folder
182184
web_app_slug = local.app_slug
183185
web_app_order = var.order
184186
web_app_group = var.group

‎registry/coder-labs/modules/sourcegraph-amp/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run [Amp CLI](https://ampcode.com/) in your workspace to access Sourcegraph's AI
1313
```tf
1414
module "amp-cli" {
1515
source = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
16-
version = "1.1.0"
16+
version = "1.1.1"
1717
agent_id = coder_agent.example.id
1818
sourcegraph_amp_api_key = var.sourcegraph_amp_api_key
1919
install_sourcegraph_amp = true
@@ -60,7 +60,7 @@ variable "sourcegraph_amp_api_key" {
6060
module "amp-cli" {
6161
count = data.coder_workspace.me.start_count
6262
source = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
63-
version = "1.1.0"
63+
version = "1.1.1"
6464
agent_id = coder_agent.example.id
6565
sourcegraph_amp_api_key = var.sourcegraph_amp_api_key # recommended for authenticated usage
6666
install_sourcegraph_amp = true

‎registry/coder-labs/modules/sourcegraph-amp/main.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,15 @@ locals {
147147
install_script = file("${path.module}/scripts/install.sh")
148148
start_script = file("${path.module}/scripts/start.sh")
149149
module_dir_name = ".sourcegraph-amp-module"
150+
folder = trimsuffix(var.folder, "/")
150151
}
151152

152153
module "agentapi" {
153154
source = "registry.coder.com/coder/agentapi/coder"
154155
version = "1.2.0"
155156

156157
agent_id = var.agent_id
158+
folder = local.folder
157159
web_app_slug = local.app_slug
158160
web_app_order = var.order
159161
web_app_group = var.group

‎registry/coder/modules/amazon-q/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run [Amazon Q](https://aws.amazon.com/q/) in your workspace to access Amazon's A
1313
```tf
1414
module "amazon-q" {
1515
source = "registry.coder.com/coder/amazon-q/coder"
16-
version = "2.1.0"
16+
version = "2.1.1"
1717
agent_id = coder_agent.example.id
1818
workdir = "/home/coder"
1919
@@ -102,7 +102,7 @@ data "coder_parameter" "ai_prompt" {
102102
103103
module "amazon-q" {
104104
source = "registry.coder.com/coder/amazon-q/coder"
105-
version = "2.1.0"
105+
version = "2.1.1"
106106
agent_id = coder_agent.example.id
107107
workdir = "/home/coder"
108108
auth_tarball = var.amazon_q_auth_tarball
@@ -228,7 +228,7 @@ If no custom `agent_config` is provided, the default agent name "agent" is used.
228228
```tf
229229
module "amazon-q" {
230230
source = "registry.coder.com/coder/amazon-q/coder"
231-
version = "2.1.0"
231+
version = "2.1.1"
232232
agent_id = coder_agent.example.id
233233
workdir = "/home/coder"
234234
auth_tarball = var.amazon_q_auth_tarball
@@ -258,7 +258,7 @@ This example will:
258258
```tf
259259
module "amazon-q" {
260260
source = "registry.coder.com/coder/amazon-q/coder"
261-
version = "2.1.0"
261+
version = "2.1.1"
262262
agent_id = coder_agent.example.id
263263
workdir = "/home/coder"
264264
auth_tarball = var.amazon_q_auth_tarball
@@ -279,7 +279,7 @@ module "amazon-q" {
279279
```tf
280280
module "amazon-q" {
281281
source = "registry.coder.com/coder/amazon-q/coder"
282-
version = "2.1.0"
282+
version = "2.1.1"
283283
agent_id = coder_agent.example.id
284284
workdir = "/home/coder"
285285
auth_tarball = var.amazon_q_auth_tarball
@@ -305,7 +305,7 @@ module "amazon-q" {
305305
```tf
306306
module "amazon-q" {
307307
source = "registry.coder.com/coder/amazon-q/coder"
308-
version = "2.1.0"
308+
version = "2.1.1"
309309
agent_id = coder_agent.example.id
310310
workdir = "/home/coder"
311311
auth_tarball = var.amazon_q_auth_tarball
@@ -319,7 +319,7 @@ module "amazon-q" {
319319
```tf
320320
module "amazon-q" {
321321
source = "registry.coder.com/coder/amazon-q/coder"
322-
version = "2.1.0"
322+
version = "2.1.1"
323323
agent_id = coder_agent.example.id
324324
workdir = "/home/coder"
325325
auth_tarball = var.amazon_q_auth_tarball
@@ -340,7 +340,7 @@ module "amazon-q" {
340340
```tf
341341
module "amazon-q" {
342342
source = "registry.coder.com/coder/amazon-q/coder"
343-
version = "2.1.0"
343+
version = "2.1.1"
344344
agent_id = coder_agent.example.id
345345
workdir = "/home/coder"
346346
auth_tarball = var.amazon_q_auth_tarball
@@ -358,7 +358,7 @@ For environments without direct internet access, you can host Amazon Q installat
358358
```tf
359359
module "amazon-q" {
360360
source = "registry.coder.com/coder/amazon-q/coder"
361-
version = "2.1.0"
361+
version = "2.1.1"
362362
agent_id = coder_agent.example.id
363363
workdir = "/home/coder"
364364
auth_tarball = var.amazon_q_auth_tarball

‎registry/coder/modules/amazon-q/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ variable "workdir" {
9696
description = "The folder to run Amazon Q in."
9797
}
9898

99-
# ---------------------------------------------
100-
10199
variable "install_amazon_q" {
102100
type = bool
103101
description = "Whether to install Amazon Q."
@@ -190,6 +188,7 @@ resource "coder_env" "auth_tarball" {
190188

191189
locals {
192190
app_slug = "amazonq"
191+
workdir = trimsuffix(var.workdir, "/")
193192
install_script = file("${path.module}/scripts/install.sh")
194193
start_script = file("${path.module}/scripts/start.sh")
195194
module_dir_name = ".amazonq-module"
@@ -218,6 +217,7 @@ module "agentapi" {
218217
version = "1.2.0"
219218

220219
agent_id = var.agent_id
220+
folder = local.workdir
221221
web_app_slug = local.app_slug
222222
web_app_order = var.order
223223
web_app_group = var.group

0 commit comments

Comments
 (0)