Unverified Commit 6259cdcf authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

pomerium: 0.28.0 -> 0.29.2 (#397260)

parents 697cf894 7669e832

pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch

+25 −22
Original line number Diff line number Diff line 
From 54e426127a35ea6c88bf0ba882f97f0712533ef5 Mon Sep 17 00:00:00 2001

From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001

From: Morgan Helton <mhelton@gmail.com>

Date: Sun, 26 May 2024 12:17:01 -0500

Subject: [PATCH] envoy: allow specification of external binary



---

 pkg/envoy/envoy.go | 17 ++++++++++-------

 1 file changed, 10 insertions(+), 7 deletions(-)

 pkg/envoy/envoy.go | 20 ++++++++++++++++----

 1 file changed, 16 insertions(+), 4 deletions(-)



diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go

index 66cf71ae..8d81090e 100644

index 8224f364..bb8b6506 100644

--- a/pkg/envoy/envoy.go

+++ b/pkg/envoy/envoy.go

@@ -8,9 +8,9 @@ import (
@@ -22,7 +22,7 @@ index 66cf71ae..8d81090e 100644 
 	"path/filepath"

 	"regexp"

 	"strconv"

@@ -34,8 +34,12 @@ import (

@@ -35,8 +35,17 @@ import (

 

 const (

 	configFileName = "envoy-config.yaml"
@@ -32,20 +32,22 @@ index 66cf71ae..8d81090e 100644 
 

+var OverrideEnvoyPath = ""

+

 type serverOptions struct {

 	services string

 	logLevel config.LogLevel

@@ -59,17 +63,16 @@ type Server struct {

+type serverOptions struct {

+	services string

+	logLevel config.LogLevel

+}

+

 // A Server is a pomerium proxy implemented via envoy.

 type Server struct {

 	ServerOptions

@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil

 		log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")

 	}

 

 // NewServer creates a new server with traffic routed by envoy.

 func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) {

-	if err := preserveRlimitNofile(); err != nil {

-		log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")

-	}

-	envoyPath, err := Extract()

+	envoyPath := OverrideEnvoyPath

+	wd := filepath.Join(os.TempDir(), workingDirectoryName)

 

-	envoyPath, err := Extract()

+

+	err := os.MkdirAll(wd, embeddedEnvoyPermissions)

 	if err != nil {

-		return nil, fmt.Errorf("extracting envoy: %w", err)
@@ -53,11 +55,12 @@ index 66cf71ae..8d81090e 100644 
 	}

 

 	srv := &Server{

 		ServerOptions: options,

-		wd:            path.Dir(envoyPath),

+		wd:            wd,

 		builder:       builder,

 		grpcPort:      src.GetConfig().GRPCPort,

 		httpPort:      src.GetConfig().HTTPPort,

-- 

2.47.0

2.48.1

pkgs/by-name/po/pomerium/package.json

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
    "@types/react-dom": "^17.0.11",

    "@typescript-eslint/eslint-plugin": "^5.10.2",

    "@typescript-eslint/parser": "^5.59.11",

    "esbuild": "^0.21.1",

    "esbuild": "^0.25.0",

    "eslint": "7.32.0",

    "eslint-config-prettier": "^8.3.0",

    "eslint-plugin-react": "^7.28.0",

pkgs/by-name/po/pomerium/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -19,15 +19,15 @@ let 
in

buildGo123Module rec {

  pname = "pomerium";

  version = "0.28.0";

  version = "0.29.2";

  src = fetchFromGitHub {

    owner = "pomerium";

    repo = "pomerium";

    rev = "v${version}";

    hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s=";

    hash = "sha256-FortINGa0JNUxVeGiJ6i+cbmapMZeCXPY9hWox+Y49o=";

  };



  vendorHash = "sha256-s6EZUZoGNBpy5RaLAPiCCCVFli+YzZ0PHJ/aH3s4APA=";

  vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q=";



  ui = mkYarnPackage {

    inherit version;

pkgs/by-name/po/pomerium/yarn-hash

+1 −1
Original line number Diff line number Diff line 
0bdrczn8mj5iidmba7xzkcyvsnwmbvcvrc1vgks2x4pxqbfyxaiv
 
1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0