Merge branch 'main' into jaaydenh/dynamic-params-websocket

jaaydenh · web-flow · commit 266620aff0b8 · 2025-04-16T17:24:12.000+01:00
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1417,13 +1417,15 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 			return nil, xerrors.Errorf("update template version external auth providers: %w", err)
 		}
 
-		err = s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
-			JobID:      jobID,
-			CachedPlan: jobType.TemplateImport.Plan,
-			UpdatedAt:  now,
-		})
-		if err != nil {
-			return nil, xerrors.Errorf("insert template version terraform data: %w", err)
+		if len(jobType.TemplateImport.Plan) > 0 {
+			err := s.Database.InsertTemplateVersionTerraformValuesByJobID(ctx, database.InsertTemplateVersionTerraformValuesByJobIDParams{
+				JobID:      jobID,
+				CachedPlan: jobType.TemplateImport.Plan,
+				UpdatedAt:  now,
+			})
+			if err != nil {
+				return nil, xerrors.Errorf("insert template version terraform data: %w", err)
+			}
 		}
 
 		err = s.Database.UpdateProvisionerJobWithCompleteByID(ctx, database.UpdateProvisionerJobWithCompleteByIDParams{
diff --git a/docs/admin/integrations/jfrog-artifactory.md b/docs/admin/integrations/jfrog-artifactory.md
@@ -1,15 +1,5 @@
 # JFrog Artifactory Integration
 
-<div>
-  <a href="https://github.com/matifali" style="text-decoration: none; color: inherit;">
-    <span style="vertical-align:middle;">M Atif Ali</span>
-    <img src="https://github.com/matifali.png" alt="matifali" width="24px" height="24px" style="vertical-align:middle; margin: 0px;"/>
-  </a>
-</div>
-January 24, 2024
-
----
-
 Use Coder and JFrog Artifactory together to secure your development environments
 without disturbing your developers' existing workflows.
 
@@ -60,8 +50,8 @@ To set this up, follow these steps:
    ```
 
 1. Create a new Application Integration by going to
-   `https://JFROG_URL/ui/admin/configuration/integrations/new` and select the
-   Application Type as the integration you created in step 1.
+   `https://JFROG_URL/ui/admin/configuration/integrations/app-integrations/new` and select the
+   Application Type as the integration you created in step 1 or `Custom Integration` if you are using SaaS instance i.e. example.jfrog.io.
 
 1. Add a new [external authentication](../../admin/external-auth.md) to Coder by setting these
    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:
 
    ```tf
    module "jfrog" {
-     source = "registry.coder.com/modules/jfrog-oauth/coder"
-     version = "1.0.0"
-     agent_id = coder_agent.example.id
-     jfrog_url = "https://jfrog.example.com"
-     configure_code_server = true # this depends on the code-server
+     count          = data.coder_workspace.me.start_count
+     source         = "registry.coder.com/modules/jfrog-oauth/coder"
+     version        = "1.0.19"
+     agent_id       = coder_agent.example.id
+     jfrog_url      = "https://example.jfrog.io"
      username_field = "username" # If you are using GitHub to login to both Coder and Artifactory, use username_field = "username"
+
      package_managers = {
-       "npm": "npm",
-       "go": "go",
-       "pypi": "pypi"
+       npm    = ["npm", "@scoped:npm-scoped"]
+       go     = ["go", "another-go-repo"]
+       pypi   = ["pypi", "extra-index-pypi"]
+       docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"]
      }
    }
    ```
@@ -117,16 +109,16 @@ To set this up, follow these steps:
    }
 
    module "jfrog" {
-     source = "registry.coder.com/modules/jfrog-token/coder"
-     version = "1.0.0"
-     agent_id = coder_agent.example.id
-     jfrog_url = "https://example.jfrog.io"
-     configure_code_server = true # this depends on the code-server
+     source                   = "registry.coder.com/modules/jfrog-token/coder"
+     version                  = "1.0.30"
+     agent_id                 = coder_agent.example.id
+     jfrog_url                = "https://XXXX.jfrog.io"
      artifactory_access_token = var.artifactory_access_token
      package_managers = {
-       "npm": "npm",
-       "go": "go",
-       "pypi": "pypi"
+       npm    = ["npm", "@scoped:npm-scoped"]
+       go     = ["go", "another-go-repo"]
+       pypi   = ["pypi", "extra-index-pypi"]
+       docker = ["example-docker-staging.jfrog.io", "example-docker-production.jfrog.io"]
      }
    }
    ```
diff --git a/go.mod b/go.mod
@@ -490,7 +490,7 @@ require (
 require (
 	github.com/coder/preview v0.0.0-20250409162646-62939c63c71a
 	github.com/kylecarbs/aisdk-go v0.0.5
-	github.com/mark3labs/mcp-go v0.17.0
+	github.com/mark3labs/mcp-go v0.20.1
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -1501,8 +1501,8 @@ github.com/makeworld-the-better-one/dither/v2 v2.4.0 h1:Az/dYXiTcwcRSe59Hzw4RI1r
 github.com/makeworld-the-better-one/dither/v2 v2.4.0/go.mod h1:VBtN8DXO7SNtyGmLiGA7IsFeKrBkQPze1/iAeM95arc=
 github.com/marekm4/color-extractor v1.2.1 h1:3Zb2tQsn6bITZ8MBVhc33Qn1k5/SEuZ18mrXGUqIwn0=
 github.com/marekm4/color-extractor v1.2.1/go.mod h1:90VjmiHI6M8ez9eYUaXLdcKnS+BAOp7w+NpwBdkJmpA=
-github.com/mark3labs/mcp-go v0.17.0 h1:5Ps6T7qXr7De/2QTqs9h6BKeZ/qdeUeGrgM5lPzi930=
-github.com/mark3labs/mcp-go v0.17.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
+github.com/mark3labs/mcp-go v0.20.1 h1:E1Bbx9K8d8kQmDZ1QHblM38c7UU2evQ2LlkANk1U/zw=
+github.com/mark3labs/mcp-go v0.20.1/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ require (`
`490`	`490`	`require (`
`491`	`491`	`github.com/coder/preview v0.0.0-20250409162646-62939c63c71a`
`492`	`492`	`github.com/kylecarbs/aisdk-go v0.0.5`
`493`		`- github.com/mark3labs/mcp-go v0.17.0`
	`493`	`+ github.com/mark3labs/mcp-go v0.20.1`
`494`	`494`	`)`
`495`	`495`
`496`	`496`	`require (`