Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit266620a

Browse files
authored
Merge branch 'main' into jaaydenh/dynamic-params-websocket
2 parents71d8fa9 +2a76f50 commit266620a

File tree

4 files changed

+32
-38
lines changed

4 files changed

+32
-38
lines changed

‎coderd/provisionerdserver/provisionerdserver.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1417,13 +1417,15 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
14171417
returnnil,xerrors.Errorf("update template version external auth providers: %w",err)
14181418
}
14191419

1420-
err=s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
1421-
JobID:jobID,
1422-
CachedPlan:jobType.TemplateImport.Plan,
1423-
UpdatedAt:now,
1424-
})
1425-
iferr!=nil {
1426-
returnnil,xerrors.Errorf("insert template version terraform data: %w",err)
1420+
iflen(jobType.TemplateImport.Plan)>0 {
1421+
err:=s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
1422+
JobID:jobID,
1423+
CachedPlan:jobType.TemplateImport.Plan,
1424+
UpdatedAt:now,
1425+
})
1426+
iferr!=nil {
1427+
returnnil,xerrors.Errorf("insert template version terraform data: %w",err)
1428+
}
14271429
}
14281430

14291431
err=s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{

‎docs/admin/integrations/jfrog-artifactory.md

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
#JFrog Artifactory Integration
22

3-
<div>
4-
<ahref="https://github.com/matifali"style="text-decoration:none;color:inherit;">
5-
<span style="vertical-align:middle;">M Atif Ali</span>
6-
<img src="https://github.com/matifali.png" alt="matifali" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
7-
</a>
8-
</div>
9-
January 24, 2024
10-
11-
---
12-
133
Use Coder and JFrog Artifactory together to secure your development environments
144
without disturbing your developers' existing workflows.
155

@@ -60,8 +50,8 @@ To set this up, follow these steps:
6050
```
6151
6252
1. Create a new Application Integration by going to
63-
`https://JFROG_URL/ui/admin/configuration/integrations/new` and select the
64-
Application Type as the integration you created in step 1.
53+
`https://JFROG_URL/ui/admin/configuration/integrations/app-integrations/new` and select the
54+
Application Type as the integration you created in step 1 or `Custom Integration` if you are using SaaS instance i.e. example.jfrog.io.
6555

6656
1. Add a new [external authentication](../../admin/external-auth.md) to Coder by setting these
6757
environment variables in a manner consistent with your Coder deployment. Replace `JFROG_URL` with your JFrog Artifactory base URL:
@@ -82,16 +72,18 @@ To set this up, follow these steps:
8272

8373
```tf
8474
module "jfrog" {
85-
source = "registry.coder.com/modules/jfrog-oauth/coder"
86-
version= "1.0.0"
87-
agent_id = coder_agent.example.id
88-
jfrog_url = "https://jfrog.example.com"
89-
configure_code_server = true # this depends on the code-server
75+
count = data.coder_workspace.me.start_count
76+
source= "registry.coder.com/modules/jfrog-oauth/coder"
77+
version = "1.0.19"
78+
agent_id = coder_agent.example.id
79+
jfrog_url = "https://example.jfrog.io"
9080
username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username"
81+
9182
package_managers = {
92-
"npm": "npm",
93-
"go": "go",
94-
"pypi": "pypi"
83+
npm = ["npm", "@scoped:npm-scoped"]
84+
go = ["go", "another-go-repo"]
85+
pypi = ["pypi", "extra-index-pypi"]
86+
docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"]
9587
}
9688
}
9789
```
@@ -117,16 +109,16 @@ To set this up, follow these steps:
117109
}
118110
119111
module "jfrog" {
120-
source = "registry.coder.com/modules/jfrog-token/coder"
121-
version = "1.0.0"
122-
agent_id = coder_agent.example.id
123-
jfrog_url = "https://example.jfrog.io"
124-
configure_code_server = true # this depends on the code-server
112+
source = "registry.coder.com/modules/jfrog-token/coder"
113+
version = "1.0.30"
114+
agent_id = coder_agent.example.id
115+
jfrog_url = "https://XXXX.jfrog.io"
125116
artifactory_access_token = var.artifactory_access_token
126117
package_managers = {
127-
"npm": "npm",
128-
"go": "go",
129-
"pypi": "pypi"
118+
npm = ["npm", "@scoped:npm-scoped"]
119+
go = ["go", "another-go-repo"]
120+
pypi = ["pypi", "extra-index-pypi"]
121+
docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"]
130122
}
131123
}
132124
```

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ require (
490490
require (
491491
github.com/coder/previewv0.0.0-20250409162646-62939c63c71a
492492
github.com/kylecarbs/aisdk-gov0.0.5
493-
github.com/mark3labs/mcp-gov0.17.0
493+
github.com/mark3labs/mcp-gov0.20.1
494494
)
495495

496496
require (

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,8 +1501,8 @@ github.com/makeworld-the-better-one/dither/v2 v2.4.0 h1:Az/dYXiTcwcRSe59Hzw4RI1r
15011501
github.com/makeworld-the-better-one/dither/v2v2.4.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc=
15021502
github.com/marekm4/color-extractorv1.2.1 h1:3Zb2tQsn6bITZ8MBVhc33Qn1k5/SEuZ18mrXGUqIwn0=
15031503
github.com/marekm4/color-extractorv1.2.1/go.mod h1:90VjmiHI6M8ez9eYUaXLdcKnS+BAOp7w+NpwBdkJmpA=
1504-
github.com/mark3labs/mcp-gov0.17.0 h1:5Ps6T7qXr7De/2QTqs9h6BKeZ/qdeUeGrgM5lPzi930=
1505-
github.com/mark3labs/mcp-gov0.17.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
1504+
github.com/mark3labs/mcp-gov0.20.1 h1:E1Bbx9K8d8kQmDZ1QHblM38c7UU2evQ2LlkANk1U/zw=
1505+
github.com/mark3labs/mcp-gov0.20.1/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
15061506
github.com/mattn/go-colorablev0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
15071507
github.com/mattn/go-colorablev0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
15081508
github.com/mattn/go-colorablev0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp