From ba4e2046c0c3c9f4e62a5ade9fd3615a2ad424a8 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Wed, 17 Apr 2024 19:05:46 +0200 Subject: [PATCH 1/2] Ignore not found component templates when dumping installed objects --- internal/dump/componenttemplates.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/internal/dump/componenttemplates.go b/internal/dump/componenttemplates.go index a2a9fef6d7..718ab711f6 100644 --- a/internal/dump/componenttemplates.go +++ b/internal/dump/componenttemplates.go @@ -9,8 +9,10 @@ import ( "encoding/json" "fmt" "io" + "net/http" "github.com/elastic/elastic-package/internal/elasticsearch" + "github.com/elastic/elastic-package/internal/logger" ) // ComponentTemplate contains information related to a component template for exporting purpouses. @@ -71,6 +73,11 @@ func getComponentTemplatesByName(ctx context.Context, api *elasticsearch.API, na } defer resp.Body.Close() + if resp.StatusCode == http.StatusNotFound { + logger.Debugf("No component template found for %q", name) + return nil, nil + } + if resp.IsError() { return nil, fmt.Errorf("failed to get component template %s: %s", name, resp.String()) } From ead492653a54216c9ce62460c4ab776e6f08fe3a Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Wed, 17 Apr 2024 19:10:00 +0200 Subject: [PATCH 2/2] Add comment, remove log --- internal/dump/componenttemplates.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/internal/dump/componenttemplates.go b/internal/dump/componenttemplates.go index 718ab711f6..a1aca69ff7 100644 --- a/internal/dump/componenttemplates.go +++ b/internal/dump/componenttemplates.go @@ -12,7 +12,6 @@ import ( "net/http" "github.com/elastic/elastic-package/internal/elasticsearch" - "github.com/elastic/elastic-package/internal/logger" ) // ComponentTemplate contains information related to a component template for exporting purpouses. @@ -73,11 +72,10 @@ func getComponentTemplatesByName(ctx context.Context, api *elasticsearch.API, na } defer resp.Body.Close() + // Component templates referenced by other templates may not exist. if resp.StatusCode == http.StatusNotFound { - logger.Debugf("No component template found for %q", name) return nil, nil } - if resp.IsError() { return nil, fmt.Errorf("failed to get component template %s: %s", name, resp.String()) }