Merge remote-tracking branch 'origin/main' into john/sled-agent-config-reconciler-zones

Author: jgallagher

nexus/external-api/src/lib.rs

@@ -498,7 +498,7 @@ pub trait NexusExternalApi {
     async fn saml_identity_provider_view(
         rqctx: RequestContext<Self::Context>,
         path_params: Path<params::ProviderPath>,
-        query_params: Query<params::SiloSelector>,
+        query_params: Query<params::OptionalSiloSelector>,
     ) -> Result<HttpResponseOk<views::SamlIdentityProvider>, HttpError>;
 
     // TODO: no DELETE for identity providers?

nexus/src/external_api/http_entrypoints.rs

@@ -706,7 +706,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
     async fn saml_identity_provider_view(
         rqctx: RequestContext<ApiContext>,
         path_params: Path<params::ProviderPath>,
-        query_params: Query<params::SiloSelector>,
+        query_params: Query<params::OptionalSiloSelector>,
     ) -> Result<HttpResponseOk<views::SamlIdentityProvider>, HttpError> {
         let apictx = rqctx.context();
         let handler = async {
@@ -717,7 +717,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
             let query = query_params.into_inner();
             let saml_identity_provider_selector =
                 params::SamlIdentityProviderSelector {
-                    silo: Some(query.silo),
+                    silo: query.silo,
                     saml_identity_provider: path.provider,
                 };
             let (.., provider) = nexus

openapi/nexus.json

@@ -7523,7 +7523,6 @@
             "in": "query",
             "name": "silo",
             "description": "Name or ID of the silo",
-            "required": true,
             "schema": {
               "$ref": "#/components/schemas/NameOrId"
             }