fix(deps): update module golang.org/x/net to v0.20.0

Adds support for loading Forge metadata from env variables

Reviewed-on: https://codeberg.org/woodpecker-plugins/go-plugin/pulls/20
Reviewed-by: qwerty287 <qwerty287@noreply.codeberg.org>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-committed-by: Lauris BH <lauris@nix.lv>

flags.go

@@ -29,6 +29,7 @@ func Flags() []cli.Flag {
 	flags = append(flags, prevFlags()...)
 	flags = append(flags, stepFlags()...)
 	flags = append(flags, systemFlags()...)
+	flags = append(flags, forgeFlags()...)
 
 	// Plugin flags
 	flags = append(flags, loggingFlags()...)

forge.go

@@ -0,0 +1,59 @@
+// Copyright 2023 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package plugin
+
+import (
+	"github.com/urfave/cli/v2"
+)
+
+const (
+	ForgeTypeGitea     = "gitea"
+	ForgeTypeGitHub    = "github"
+	ForgeTypeGitLab    = "gitlab"
+	ForgeTypeBitbucket = "bitbucket"
+)
+
+// Forge defines metadata for integration with a forge.
+type Forge struct {
+	Type string `json:"type,omitempty"`
+	Link string `json:"link,omitempty"`
+}
+
+func forgeFlags() []cli.Flag {
+	return []cli.Flag{
+		&cli.StringFlag{
+			Name:  "forge.type",
+			Usage: "forge type (gitea, github, gitlab, bitbucker)",
+			EnvVars: []string{
+				"CI_FORGE_TYPE",
+			},
+		},
+		&cli.StringFlag{
+			Name:  "forge.link",
+			Usage: "forge link",
+			EnvVars: []string{
+				"CI_FORGE_URL",
+				"CI_FORGE_LINK",
+			},
+		},
+	}
+}
+
+func forgeFromContext(ctx *cli.Context) Forge {
+	return Forge{
+		Type: ctx.String("forge.type"),
+		Link: ctx.String("forge.link"),
+	}
+}

go.mod

@@ -6,8 +6,8 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/rs/zerolog v1.31.0
 	github.com/stretchr/testify v1.8.4
-	github.com/urfave/cli/v2 v2.26.0
-	golang.org/x/net v0.19.0
+	github.com/urfave/cli/v2 v2.27.1
+	golang.org/x/net v0.20.0
 )
 
 require (
@@ -18,6 +18,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -45,6 +45,10 @@ github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
 github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=
 github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.27.0 h1:uNs1K8JwTFL84X68j5Fjny6hfANh9nTlJ6dRtZAFAHY=
+github.com/urfave/cli/v2 v2.27.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
+github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
@@ -55,6 +59,8 @@ golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -69,6 +75,8 @@ golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
 golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

metadata.go

@@ -26,6 +26,7 @@ type Metadata struct {
 	Prev       Commit     `json:"prev,omitempty"`
 	Step       Step       `json:"step,omitempty"`
 	System     System     `json:"sys,omitempty"`
+	Forge      Forge      `json:"forge,omitempty"`
 }
 
 // MetadataFromContext creates a Metadata from the cli.Context.
@@ -37,5 +38,6 @@ func MetadataFromContext(ctx *cli.Context) Metadata {
 		Prev:       prevFromContext(ctx),
 		Step:       stepFromContext(ctx),
 		System:     systemFromContext(ctx),
+		Forge:      forgeFromContext(ctx),
 	}
 }

metadata_test.go

@@ -48,7 +48,7 @@ func testMetadata() map[string]string {
 		"CI_COMMIT_URL":           "https://codeberg.org/woodpecker-plugins/go-plugin/commit/a1b2c3d4",
 		// Build
 		"CI_PIPELINE_NUMBER":  "1",
-		"CI_PIPELINE_EVENT":   "push",
+		"CI_PIPELINE_EVENT":   EventTypePush,
 		"CI_PIPELINE_URL":     "https://ci.woodpecker-ci.org/woodpecker-ci/woodpecker/1",
 		"CI_PIPELINE_STATUS":  "running",
 		"CI_PIPELINE_CREATED": "1611234567",
@@ -63,6 +63,9 @@ func testMetadata() map[string]string {
 		"CI_SYSTEM_URL":     "https://ci.woodpecker-ci.org",
 		"CI_SYSTEM_VERSION": "1.0.0",
 		"CI_SYSTEM_HOST":    "woodpecker-ci.org",
+		// Forge
+		"CI_FORGE_TYPE": ForgeTypeGitea,
+		"CI_FORGE_URL":  "https://codeberg.org",
 	}
 }
 
@@ -99,7 +102,7 @@ func TestMetadata(t *testing.T) {
 
 	// Pipeline
 	assert.Equal(t, int64(1), plugin.Metadata.Pipeline.Number)
-	assert.Equal(t, "push", plugin.Metadata.Pipeline.Event)
+	assert.Equal(t, EventTypePush, plugin.Metadata.Pipeline.Event)
 	assert.Equal(t, "https://ci.woodpecker-ci.org/woodpecker-ci/woodpecker/1", plugin.Metadata.Pipeline.Link)
 	assert.Equal(t, "running", plugin.Metadata.Pipeline.Status)
 	assert.Equal(t, time.Unix(1611234567, 0), plugin.Metadata.Pipeline.Created)
@@ -114,4 +117,8 @@ func TestMetadata(t *testing.T) {
 	assert.Equal(t, "https://ci.woodpecker-ci.org", plugin.Metadata.System.Link)
 	assert.Equal(t, "1.0.0", plugin.Metadata.System.Version)
 	assert.Equal(t, "woodpecker-ci.org", plugin.Metadata.System.Host)
+
+	// Forge
+	assert.Equal(t, ForgeTypeGitea, plugin.Metadata.Forge.Type)
+	assert.Equal(t, "https://codeberg.org", plugin.Metadata.Forge.Link)
 }

pipeline.go

@@ -20,6 +20,15 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
+const (
+	EventTypePush        = "push"
+	EventTypePullRequest = "pull_request"
+	EventTypeTag         = "tag"
+	EventTypeDeployment  = "deployment"
+	EventTypeCron        = "cron"
+	EventTypeManual      = "manual"
+)
+
 // Pipeline defines runtime metadata for a pipeline.
 type Pipeline struct {
 	Number       int64     `json:"number,omitempty"`