Merge pull request #10 from firehydrant/update_everything

Add dependabot, update to current golang and api version

Author: AlexisJasso

.circleci/config.yml

@@ -1,8 +1,8 @@
-version: 2
+version: 2.1
 jobs:
   release:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.24.1
     working_directory: /go/src/github.com/firehydrant/fhcli
     steps:
       - checkout

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.gitignore

@@ -1,3 +1,4 @@
 fhcli
 dist/
 config.yml
+.DS_Store

go.mod

@@ -1,35 +1,39 @@
 module github.com/firehydrant/fhcli
 
-go 1.19
+go 1.24.1
 
 require (
-	github.com/firehydrant/api-client-go v0.0.0-20190226212857-d3f5f8fd67b3
-	github.com/go-openapi/strfmt v0.21.7
+	github.com/firehydrant/api-client-go v0.0.0-20250416195931-2c92272bebd1
+	github.com/go-openapi/strfmt v0.23.0
 	gopkg.in/urfave/cli.v1 v1.20.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/analysis v0.21.4 // indirect
-	github.com/go-openapi/errors v0.20.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/loads v0.21.2 // indirect
-	github.com/go-openapi/runtime v0.26.0 // indirect
-	github.com/go-openapi/spec v0.20.9 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-openapi/validate v0.22.1 // indirect
+	github.com/go-openapi/analysis v0.23.0 // indirect
+	github.com/go-openapi/errors v0.22.1 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/loads v0.22.0 // indirect
+	github.com/go-openapi/runtime v0.28.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
+	github.com/go-openapi/validate v0.24.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	go.mongodb.org/mongo-driver v1.11.6 // indirect
-	go.opentelemetry.io/otel v1.14.0 // indirect
-	go.opentelemetry.io/otel/trace v1.14.0 // indirect
+	go.mongodb.org/mongo-driver v1.17.4 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/otel v1.37.0 // indirect
+	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -23,7 +23,7 @@ func eventCmd(c *cli.Context) error {
 
 	identities := fhclient.APIKVtoChangeIdentities(fhclient.MapToAPIKV(fhclient.ParseKV(c.String("identities"))))
 
-	params.V1ChangesEvents = &models.PostV1ChangesEvents{
+	params.PostV1ChangesEvents = &models.PostV1ChangesEvents{
 		Environments:     fhclient.ParamToList(c.String("environment")),
 		Services:         fhclient.ParamToList(c.String("service")),
 		StartsAt:         strfmt.DateTime(time.Now()),

pkg/cli/event.go

@@ -31,7 +31,7 @@ func executeCmd(c *cli.Context) error {
 
 	identities := fhclient.ParseKV(c.String("identities"))
 
-	params.V1ChangesEvents = &models.PostV1ChangesEvents{
+	params.PostV1ChangesEvents = &models.PostV1ChangesEvents{
 		Environments: fhclient.ParamToList(c.String("environment")),
 		Services:     fhclient.ParamToList(c.String("service")),
 		StartsAt:     strfmt.DateTime(time.Now()),
@@ -50,8 +50,8 @@ func executeCmd(c *cli.Context) error {
 	cErr := cmdExec.Run()
 
 	duration := time.Since(start) / time.Millisecond
-	params.V1ChangesEvents.EndsAt = strfmt.DateTime(time.Now())
-	params.V1ChangesEvents.StartsAt = strfmt.DateTime(start)
+	params.PostV1ChangesEvents.EndsAt = strfmt.DateTime(time.Now())
+	params.PostV1ChangesEvents.StartsAt = strfmt.DateTime(start)
 
 	// getting the exit code is a pita so i'm not doing it yet
 	if cErr != nil {
@@ -61,7 +61,7 @@ func executeCmd(c *cli.Context) error {
 		fmt.Println(fmt.Sprintf("Executed command, duration %dms", duration))
 	}
 
-	params.V1ChangesEvents.ChangeIdentities = fhclient.APIKVtoChangeIdentities(fhclient.MapToAPIKV(identities))
+	params.PostV1ChangesEvents.ChangeIdentities = fhclient.APIKVtoChangeIdentities(fhclient.MapToAPIKV(identities))
 	resp, err := client.Client.Changes.PostV1ChangesEvents(params, client.Auth)
 
 	if err != nil {

pkg/cli/execute.go

@@ -34,8 +34,8 @@ $ fhcli --version
 
 ### Parameters
 
-* Environment Name `--environment` `FH_ENVIRONMENT`
-* Service `--service` `FH_SERVICE`
+* Environment (Id or slug) `--environment` `FH_ENVIRONMENT`
+* Service (Id or slug) `--service` `FH_SERVICE`
 * API Key `--apiKey` `FH_API_KEY`
 * Config file `--config` `FH_CONFIG_FILE`
 * Identities `--identities` `FH_IDENTITIES`
@@ -44,6 +44,8 @@ _or_
 * Command
   This command is run in a subshell, automatically instrumented with a duration and the result is submitted to the FH API
 
+Note: For Environments and Services, arbitrary values will result in these fields being left blank.  Please make sure that the ID or slug used here matches the value for your environment/service in the Service Catalog.
+
 ### Environment Variables
 
 ### Configuration file