Merge branch 'main' into release/1.51

* main: chore: pin goreleaser to 2.3.x (#3598) fix: devcontainer update go version to 1.23 (#3597) docs: add MMartyn as a contributor for code (#3596) fix: update attachment messaging and size to allow 1mb (#3595)
flipt-io · Nov 5, 2024 · ad7cb67 · ad7cb67
2 parents a182441 + dd3702c
commit ad7cb67
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 11 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -520,6 +520,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "MMartyn",
+      "name": "Matt Martyn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1448102?v=4",
+      "profile": "https://github.com/MMartyn",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22
+ARG GO_VERSION=1.23
 
 FROM golang:${GO_VERSION}
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -74,7 +74,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: latest
+          version: "~> v2.3.0"
           args: release --clean --nightly -f .goreleaser.${{ matrix.name }}.yml
         env:
           GORELEASER_CURRENT_TAG: ${{ env.GORELEASER_CURRENT_TAG }}
@@ -143,7 +143,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: latest
+          version: "~> v2.3.0"
           args: release --nightly -f .goreleaser.nightly.yml
         env:
           GORELEASER_CURRENT_TAG: ${{ env.GORELEASER_CURRENT_TAG }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -72,7 +72,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: latest
+          version: "~> v2.3.0"
           args: build --clean -f .goreleaser.${{ matrix.name }}.yml
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
@@ -149,7 +149,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: latest
+          version: "~> v2.3.0"
           args: release --clean
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -66,7 +66,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: latest
+          version: "~> v2.3.0"
           args: build --clean --snapshot -f .goreleaser.${{ matrix.name }}.yml
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
@@ -117,7 +117,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: latest
+          version: "~> v2.3.0"
           args: build --snapshot
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

diff --git a/README.md b/README.md
@@ -415,6 +415,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/devumesh"><img src="https://avatars.githubusercontent.com/u/58872100?v=4?s=100" width="100px;" alt="Umesh Balamurugan"/><br /><sub><b>Umesh Balamurugan</b></sub></a><br /><a href="https://github.com/flipt-io/flipt/commits?author=devumesh" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MMartyn"><img src="https://avatars.githubusercontent.com/u/1448102?v=4?s=100" width="100px;" alt="Matt Martyn"/><br /><sub><b>Matt Martyn</b></sub></a><br /><a href="https://github.com/flipt-io/flipt/commits?author=MMartyn" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

diff --git a/rpc/flipt/validation.go b/rpc/flipt/validation.go
@@ -11,8 +11,8 @@ import (
 )
 
 const (
-	maxJsonStringSize = 10000
-	entityPropertyKey = "entityId"
+	maxJsonStringSizeKB = 1000
+	entityPropertyKey   = "entityId"
 )
 
 // Validator validates types
@@ -32,9 +32,9 @@ func validateJsonParameter(jsonValue string, parameterName string) error {
 		return errors.InvalidFieldError(parameterName, "must be a json string")
 	}
 
-	if len(bytes) > maxJsonStringSize {
+	if len(bytes) > (maxJsonStringSizeKB * 1024) {
 		return errors.InvalidFieldError(parameterName,
-			fmt.Sprintf("must be less than %d KB", maxJsonStringSize),
+			fmt.Sprintf("must be less than %d KB", maxJsonStringSizeKB),
 		)
 	}