Merge remote-tracking branch 'origin/main' into cdoxsey/submodules

Author: calebdoxsey

src/pomerium-console/routes.ts

@@ -211,7 +211,7 @@ export interface OAuth2Endpoint {
 }
 /**
  * Route defines a proxy route's settings and policy associations
- * Next ID: 75
+ * Next ID: 77
  *
  * @generated from protobuf message pomerium.dashboard.Route
  */
@@ -484,6 +484,10 @@ export interface Route {
      * @generated from protobuf field: optional int32 healthy_panic_threshold = 75;
      */
     healthyPanicThreshold?: number;
+    /**
+     * @generated from protobuf field: optional pomerium.dashboard.UpstreamTunnel upstream_tunnel = 76;
+     */
+    upstreamTunnel?: UpstreamTunnel;
 }
 /**
  * @generated from protobuf message pomerium.dashboard.Route.StringList
@@ -494,6 +498,11 @@ export interface Route_StringList {
      */
     values: string[];
 }
+/**
+ * @generated from protobuf message pomerium.dashboard.UpstreamTunnel
+ */
+export interface UpstreamTunnel {
+}
 /**
  * RouteWithPolicies contains automatically created routes and policies from a
  * LoadRoutesRequest
@@ -1390,7 +1399,8 @@ class Route$Type extends MessageType<Route> {
             { no: 71, name: "health_checks", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => HealthCheck },
             { no: 73, name: "circuit_breaker_thresholds", kind: "message", T: () => CircuitBreakerThresholds },
             { no: 74, name: "mcp", kind: "message", T: () => MCP },
-            { no: 75, name: "healthy_panic_threshold", kind: "scalar", opt: true, T: 5 /*ScalarType.INT32*/ }
+            { no: 75, name: "healthy_panic_threshold", kind: "scalar", opt: true, T: 5 /*ScalarType.INT32*/ },
+            { no: 76, name: "upstream_tunnel", kind: "message", T: () => UpstreamTunnel }
         ]);
     }
     create(value?: PartialMessage<Route>): Route {
@@ -1613,6 +1623,9 @@ class Route$Type extends MessageType<Route> {
                 case /* optional int32 healthy_panic_threshold */ 75:
                     message.healthyPanicThreshold = reader.int32();
                     break;
+                case /* optional pomerium.dashboard.UpstreamTunnel upstream_tunnel */ 76:
+                    message.upstreamTunnel = UpstreamTunnel.internalBinaryRead(reader, reader.uint32(), options, message.upstreamTunnel);
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -1846,6 +1859,9 @@ class Route$Type extends MessageType<Route> {
         /* optional int32 healthy_panic_threshold = 75; */
         if (message.healthyPanicThreshold !== undefined)
             writer.tag(75, WireType.Varint).int32(message.healthyPanicThreshold);
+        /* optional pomerium.dashboard.UpstreamTunnel upstream_tunnel = 76; */
+        if (message.upstreamTunnel)
+            UpstreamTunnel.internalBinaryWrite(message.upstreamTunnel, writer.tag(76, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -1904,6 +1920,31 @@ class Route_StringList$Type extends MessageType<Route_StringList> {
  */
 export const Route_StringList = new Route_StringList$Type();
 // @generated message type with reflection information, may provide speed optimized methods
+class UpstreamTunnel$Type extends MessageType<UpstreamTunnel> {
+    constructor() {
+        super("pomerium.dashboard.UpstreamTunnel", []);
+    }
+    create(value?: PartialMessage<UpstreamTunnel>): UpstreamTunnel {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        if (value !== undefined)
+            reflectionMergePartial<UpstreamTunnel>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: UpstreamTunnel): UpstreamTunnel {
+        return target ?? this.create();
+    }
+    internalBinaryWrite(message: UpstreamTunnel, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message pomerium.dashboard.UpstreamTunnel
+ */
+export const UpstreamTunnel = new UpstreamTunnel$Type();
+// @generated message type with reflection information, may provide speed optimized methods
 class RouteWithPolicies$Type extends MessageType<RouteWithPolicies> {
     constructor() {
         super("pomerium.dashboard.RouteWithPolicies", [

src/pomerium-console/settings.ts

@@ -33,7 +33,7 @@ export interface ConsoleSettings {
 }
 /**
  * Settings defines the global pomerium settings
- * Next id: 120.
+ * Next id: 122.
  *
  * @generated from protobuf message pomerium.dashboard.Settings
  */
@@ -81,25 +81,33 @@ export interface Settings {
     /**
      * dns options
      *
-     * @generated from protobuf field: optional string dns_lookup_family = 60;
+     * @generated from protobuf field: optional google.protobuf.Duration dns_failure_refresh_rate = 120;
      */
-    dnsLookupFamily?: string;
+    dnsFailureRefreshRate?: Duration;
     /**
-     * @generated from protobuf field: optional uint32 dns_udp_max_queries = 116;
+     * @generated from protobuf field: optional string dns_lookup_family = 60;
      */
-    dnsUdpMaxQueries?: number;
+    dnsLookupFamily?: string;
     /**
-     * @generated from protobuf field: optional bool dns_use_tcp = 117;
+     * @generated from protobuf field: optional google.protobuf.Duration dns_query_timeout = 119;
      */
-    dnsUseTcp?: boolean;
+    dnsQueryTimeout?: Duration;
     /**
      * @generated from protobuf field: optional uint32 dns_query_tries = 118;
      */
     dnsQueryTries?: number;
     /**
-     * @generated from protobuf field: optional google.protobuf.Duration dns_query_timeout = 119;
+     * @generated from protobuf field: optional google.protobuf.Duration dns_refresh_rate = 121;
      */
-    dnsQueryTimeout?: Duration;
+    dnsRefreshRate?: Duration;
+    /**
+     * @generated from protobuf field: optional uint32 dns_udp_max_queries = 116;
+     */
+    dnsUdpMaxQueries?: number;
+    /**
+     * @generated from protobuf field: optional bool dns_use_tcp = 117;
+     */
+    dnsUseTcp?: boolean;
     /**
      * @generated from protobuf field: repeated pomerium.dashboard.Settings.Certificate certificates = 9;
      */
@@ -617,11 +625,13 @@ class Settings$Type extends MessageType<Settings> {
             { no: 6, name: "services", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
             { no: 7, name: "address", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
             { no: 8, name: "insecure_server", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ },
+            { no: 120, name: "dns_failure_refresh_rate", kind: "message", T: () => Duration },
             { no: 60, name: "dns_lookup_family", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
+            { no: 119, name: "dns_query_timeout", kind: "message", T: () => Duration },
+            { no: 118, name: "dns_query_tries", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
+            { no: 121, name: "dns_refresh_rate", kind: "message", T: () => Duration },
             { no: 116, name: "dns_udp_max_queries", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
             { no: 117, name: "dns_use_tcp", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ },
-            { no: 118, name: "dns_query_tries", kind: "scalar", opt: true, T: 13 /*ScalarType.UINT32*/ },
-            { no: 119, name: "dns_query_timeout", kind: "message", T: () => Duration },
             { no: 9, name: "certificates", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => Settings_Certificate },
             { no: 10, name: "http_redirect_addr", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ },
             { no: 11, name: "timeout_read", kind: "message", T: () => Duration },
@@ -760,21 +770,27 @@ class Settings$Type extends MessageType<Settings> {
                 case /* optional bool insecure_server */ 8:
                     message.insecureServer = reader.bool();
                     break;
+                case /* optional google.protobuf.Duration dns_failure_refresh_rate */ 120:
+                    message.dnsFailureRefreshRate = Duration.internalBinaryRead(reader, reader.uint32(), options, message.dnsFailureRefreshRate);
+                    break;
                 case /* optional string dns_lookup_family */ 60:
                     message.dnsLookupFamily = reader.string();
                     break;
+                case /* optional google.protobuf.Duration dns_query_timeout */ 119:
+                    message.dnsQueryTimeout = Duration.internalBinaryRead(reader, reader.uint32(), options, message.dnsQueryTimeout);
+                    break;
+                case /* optional uint32 dns_query_tries */ 118:
+                    message.dnsQueryTries = reader.uint32();
+                    break;
+                case /* optional google.protobuf.Duration dns_refresh_rate */ 121:
+                    message.dnsRefreshRate = Duration.internalBinaryRead(reader, reader.uint32(), options, message.dnsRefreshRate);
+                    break;
                 case /* optional uint32 dns_udp_max_queries */ 116:
                     message.dnsUdpMaxQueries = reader.uint32();
                     break;
                 case /* optional bool dns_use_tcp */ 117:
                     message.dnsUseTcp = reader.bool();
                     break;
-                case /* optional uint32 dns_query_tries */ 118:
-                    message.dnsQueryTries = reader.uint32();
-                    break;
-                case /* optional google.protobuf.Duration dns_query_timeout */ 119:
-                    message.dnsQueryTimeout = Duration.internalBinaryRead(reader, reader.uint32(), options, message.dnsQueryTimeout);
-                    break;
                 case /* repeated pomerium.dashboard.Settings.Certificate certificates */ 9:
                     message.certificates.push(Settings_Certificate.internalBinaryRead(reader, reader.uint32(), options));
                     break;
@@ -1120,21 +1136,27 @@ class Settings$Type extends MessageType<Settings> {
         /* optional bool insecure_server = 8; */
         if (message.insecureServer !== undefined)
             writer.tag(8, WireType.Varint).bool(message.insecureServer);
+        /* optional google.protobuf.Duration dns_failure_refresh_rate = 120; */
+        if (message.dnsFailureRefreshRate)
+            Duration.internalBinaryWrite(message.dnsFailureRefreshRate, writer.tag(120, WireType.LengthDelimited).fork(), options).join();
         /* optional string dns_lookup_family = 60; */
         if (message.dnsLookupFamily !== undefined)
             writer.tag(60, WireType.LengthDelimited).string(message.dnsLookupFamily);
+        /* optional google.protobuf.Duration dns_query_timeout = 119; */
+        if (message.dnsQueryTimeout)
+            Duration.internalBinaryWrite(message.dnsQueryTimeout, writer.tag(119, WireType.LengthDelimited).fork(), options).join();
+        /* optional uint32 dns_query_tries = 118; */
+        if (message.dnsQueryTries !== undefined)
+            writer.tag(118, WireType.Varint).uint32(message.dnsQueryTries);
+        /* optional google.protobuf.Duration dns_refresh_rate = 121; */
+        if (message.dnsRefreshRate)
+            Duration.internalBinaryWrite(message.dnsRefreshRate, writer.tag(121, WireType.LengthDelimited).fork(), options).join();
         /* optional uint32 dns_udp_max_queries = 116; */
         if (message.dnsUdpMaxQueries !== undefined)
             writer.tag(116, WireType.Varint).uint32(message.dnsUdpMaxQueries);
         /* optional bool dns_use_tcp = 117; */
         if (message.dnsUseTcp !== undefined)
             writer.tag(117, WireType.Varint).bool(message.dnsUseTcp);
-        /* optional uint32 dns_query_tries = 118; */
-        if (message.dnsQueryTries !== undefined)
-            writer.tag(118, WireType.Varint).uint32(message.dnsQueryTries);
-        /* optional google.protobuf.Duration dns_query_timeout = 119; */
-        if (message.dnsQueryTimeout)
-            Duration.internalBinaryWrite(message.dnsQueryTimeout, writer.tag(119, WireType.LengthDelimited).fork(), options).join();
         /* repeated pomerium.dashboard.Settings.Certificate certificates = 9; */
         for (let i = 0; i < message.certificates.length; i++)
             Settings_Certificate.internalBinaryWrite(message.certificates[i], writer.tag(9, WireType.LengthDelimited).fork(), options).join();