From d997fc6713055eaf7952c3f0650497caccb415b5 Mon Sep 17 00:00:00 2001
From: Pranav Gaikwad <pgaikwad@redhat.com>
Date: Fri, 21 Jun 2024 13:11:18 -0400
Subject: [PATCH 1/5] :sparkles: configure builtin provider internally

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
---
 Makefile                                      |   2 +-
 cmd/analyzer/main.go                          |  33 +-
 cmd/dep/main.go                               |   2 +-
 demo-output.yaml                              |  30 +-
 .../pkg/dotnet/provider.go                    |  19 +-
 .../pkg/generic_external_provider/provider.go |   8 +-
 .../generic/service_client_test.go            |   2 +-
 .../pylsp/service_client_test.go              |   2 +-
 .../service_client_test.go                    |   2 +-
 .../pkg/java_external_provider/provider.go    |  30 +-
 .../pkg/yq_provider/provider.go               |  14 +-
 parser/rule_parser_test.go                    |   8 +-
 provider/grpc/provider.go                     |  33 +-
 provider/internal/builtin/provider.go         |  24 +-
 provider/internal/grpc/library.pb.go          | 521 +++++++++---------
 provider/internal/grpc/library.proto          |   1 +
 provider/internal/grpc/library_grpc.pb.go     |   2 +-
 provider/provider.go                          |   8 +-
 provider/provider_test.go                     |   4 +-
 provider/server.go                            |  13 +-
 provider_container_settings.json              |   2 +-
 provider_local_external_images.json           |   2 +-
 provider_pod_local_settings.json              |   2 +-
 23 files changed, 428 insertions(+), 336 deletions(-)

diff --git a/Makefile b/Makefile
index 28b87bd9..13355d3a 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ run-external-providers-pod:
 	podman build -f demo-local.Dockerfile -t localhost/testing:latest
 
 run-demo-image:
-	podman run --entrypoint /usr/local/bin/konveyor-analyzer --pod=analyzer -v $(PWD)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(PWD)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --output-file=/analyzer-lsp/output.yaml --dep-output-file=/analyzer-lsp/demo-dep-output.yaml
+	podman run --entrypoint /usr/local/bin/konveyor-analyzer --pod=analyzer -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) -v $(PWD)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(PWD)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --output-file=/analyzer-lsp/output.yaml --dep-output-file=/analyzer-lsp/demo-dep-output.yaml
 
 stop-external-providers-pod: stop-external-providers
 	podman pod kill analyzer
diff --git a/cmd/analyzer/main.go b/cmd/analyzer/main.go
index c7de70f8..a5aee3ce 100644
--- a/cmd/analyzer/main.go
+++ b/cmd/analyzer/main.go
@@ -128,6 +128,7 @@ func AnalysisCmd() *cobra.Command {
 			}
 
 			providers := map[string]provider.InternalProviderClient{}
+			builtinConfigs := []provider.InitConfig{}
 			providerLocations := []string{}
 			for _, config := range configs {
 				config.ContextLines = contextLines
@@ -140,6 +141,9 @@ func AnalysisCmd() *cobra.Command {
 					for _, i := range config.InitConfig {
 						i.AnalysisMode = provider.AnalysisMode(analysisMode)
 						inits = append(inits, i)
+						builtinConfigs = append(builtinConfigs, provider.InitConfig{
+							Location: i.Location,
+						})
 					}
 					config.InitConfig = inits
 				}
@@ -205,14 +209,31 @@ func AnalysisCmd() *cobra.Command {
 			}
 			// Now that we have all the providers, we need to start them.
 			for name, provider := range needProviders {
-				initCtx, initSpan := tracing.StartNewSpan(ctx, "init",
-					attribute.Key("provider").String(name))
-				err := provider.ProviderInit(initCtx)
-				if err != nil {
-					errLog.Error(err, "unable to init the providers", "provider", name)
+				switch name {
+				// other providers can return additional configs for the builtin provider
+				// therefore, we initiate builtin provider separately at the end
+				case "builtin":
+					continue
+				default:
+					initCtx, initSpan := tracing.StartNewSpan(ctx, "init",
+						attribute.Key("provider").String(name))
+					additionalBuiltinConfs, err := provider.ProviderInit(initCtx, nil)
+					if err != nil {
+						errLog.Error(err, "unable to init the providers", "provider", name)
+						os.Exit(1)
+					}
+					if additionalBuiltinConfs != nil {
+						builtinConfigs = append(builtinConfigs, additionalBuiltinConfs...)
+					}
+					initSpan.End()
+				}
+			}
+
+			if builtinClient, ok := needProviders["builtin"]; ok {
+				if _, err = builtinClient.ProviderInit(ctx, builtinConfigs); err != nil {
+					errLog.Error(err, "unable to init builtin provider")
 					os.Exit(1)
 				}
-				initSpan.End()
 			}
 
 			wg := &sync.WaitGroup{}
diff --git a/cmd/dep/main.go b/cmd/dep/main.go
index 67615589..beb985a3 100644
--- a/cmd/dep/main.go
+++ b/cmd/dep/main.go
@@ -90,7 +90,7 @@ func DependencyCmd() *cobra.Command {
 
 				time.Sleep(5 * time.Second)
 
-				err = prov.ProviderInit(ctx)
+				_, err = prov.ProviderInit(ctx, nil)
 				b, _ := json.Marshal(config)
 				if err != nil {
 					errLog.Error(err, "unable to init the providers", "provider", config.Name, "the-error-is", err, "config", string(b))
diff --git a/demo-output.yaml b/demo-output.yaml
index bdbbe45a..9d0873a3 100644
--- a/demo-output.yaml
+++ b/demo-output.yaml
@@ -201,6 +201,14 @@
           data: dependency
           innerText: "\n\t\t\torg.springframework\n\t\t\tspring-webmvc\n\t\t\t${spring-framework.version}\n\t\t"
           matchingXML: <groupId>org.springframework</groupId><artifactId>spring-webmvc</artifactId><version>${spring-framework.version}</version>
+      - uri: file:///examples/java-project/pom.xml
+        message: <groupId>io.javaoperatorsdk.operator</groupId><artifactId>sample</artifactId><version>0.0.0</version>
+        codeSnip: "11    <url>http://www.konveyor.io</url>\n12  \n13    <properties>\n14      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n15    </properties>\n16  \n17    <dependencies>\n18  \n19      <dependency>\n20        <groupId>io.javaoperatorsdk.operator</groupId>\n21        <artifactId>sample</artifactId>\n22        <version>0.0.0</version>\n23      </dependency>\n24  \n25    </dependencies>\n26  \n27    <build>\n28    </build>\n29  </project>\n"
+        lineNumber: 20
+        variables:
+          data: dependency
+          innerText: "\n      io.javaoperatorsdk.operator\n      sample\n      0.0.0\n    "
+          matchingXML: <groupId>io.javaoperatorsdk.operator</groupId><artifactId>sample</artifactId><version>0.0.0</version>
       - uri: file:///examples/java/dummy/pom.xml
         message: |-
           <groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
@@ -781,6 +789,14 @@
           data: dependency
           innerText: "\n\t\t\torg.springframework\n\t\t\tspring-webmvc\n\t\t\t${spring-framework.version}\n\t\t"
           matchingXML: <groupId>org.springframework</groupId><artifactId>spring-webmvc</artifactId><version>${spring-framework.version}</version>
+      - uri: file:///examples/java-project/pom.xml
+        message: POM XML dependencies - '<groupId>io.javaoperatorsdk.operator</groupId><artifactId>sample</artifactId><version>0.0.0</version>'
+        codeSnip: "11    <url>http://www.konveyor.io</url>\n12  \n13    <properties>\n14      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n15    </properties>\n16  \n17    <dependencies>\n18  \n19      <dependency>\n20        <groupId>io.javaoperatorsdk.operator</groupId>\n21        <artifactId>sample</artifactId>\n22        <version>0.0.0</version>\n23      </dependency>\n24  \n25    </dependencies>\n26  \n27    <build>\n28    </build>\n29  </project>\n"
+        lineNumber: 20
+        variables:
+          data: dependency
+          innerText: "\n      io.javaoperatorsdk.operator\n      sample\n      0.0.0\n    "
+          matchingXML: <groupId>io.javaoperatorsdk.operator</groupId><artifactId>sample</artifactId><version>0.0.0</version>
       - uri: file:///examples/java/dummy/pom.xml
         message: |-
           POM XML dependencies - '<groupId>javax</groupId><artifactId>javaee-api</artifactId><!-- This leads to https://github.com/konveyor/analyzer-lsp/issues/390
@@ -960,21 +976,21 @@
       labels:
       - tag=Java Operator SDK
       incidents:
-      - uri: file:///java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
+      - uri: file:///examples/java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
         message: ""
         codeSnip: " 1  package io.javaoperatorsdk.operator.sample;\n 2  \n 3  import io.fabric8.kubernetes.client.KubernetesClient;\n 4  import io.javaoperatorsdk.operator.Operator;\n 5  import io.javaoperatorsdk.operator.api.config.ConfigurationService;\n 6  import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;\n 7  import io.quarkus.runtime.Quarkus;\n 8  import io.quarkus.runtime.QuarkusApplication;\n 9  import io.quarkus.runtime.annotations.QuarkusMain;\n10  import javax.inject.Inject;\n11  \n12  @QuarkusMain\n13  public class QuarkusOperator implements QuarkusApplication {\n14     @Inject"
         lineNumber: 4
         variables:
-          file: file:///java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
+          file: file:///examples/java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
           kind: Module
           name: io.javaoperatorsdk.operator.Operator
           package: io.javaoperatorsdk.operator.sample
-      - uri: file:///java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
+      - uri: file:///examples/java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
         message: ""
         codeSnip: " 7  import io.quarkus.runtime.Quarkus;\n 8  import io.quarkus.runtime.QuarkusApplication;\n 9  import io.quarkus.runtime.annotations.QuarkusMain;\n10  import javax.inject.Inject;\n11  \n12  @QuarkusMain\n13  public class QuarkusOperator implements QuarkusApplication {\n14     @Inject\n15     KubernetesClient client;\n16     @Inject\n17     Operator operator;\n18     @Inject\n19     ConfigurationService configuration;\n20     @Inject\n21     CustomServiceController controller;\n22  \n23     public static void main(String... args) {\n24        Quarkus.run(QuarkusOperator.class, args);\n25     }\n26  \n27     public int run(String... args) throws Exception {"
         lineNumber: 17
         variables:
-          file: file:///java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
+          file: file:///examples/java-project/src/main/java/io/javaoperatorsdk/operator/sample/QuarkusOperator.java
           kind: Field
           name: operator
           package: io.javaoperatorsdk.operator.sample
@@ -1002,6 +1018,12 @@
       incidents:
       - uri: file:///examples/customers-tomcat-legacy/pom.xml
         message: ""
+      - uri: file:///examples/gradle-multi-project-example/gradle/wrapper/gradle-wrapper.jar
+        message: ""
+      - uri: file:///examples/inclusion-tests/pom.xml
+        message: ""
+      - uri: file:///examples/java-project/pom.xml
+        message: ""
       - uri: file:///examples/java/dummy/pom.xml
         message: ""
       - uri: file:///examples/java/example/pom.xml
diff --git a/external-providers/dotnet-external-provider/pkg/dotnet/provider.go b/external-providers/dotnet-external-provider/pkg/dotnet/provider.go
index 655e59be..9b62510f 100644
--- a/external-providers/dotnet-external-provider/pkg/dotnet/provider.go
+++ b/external-providers/dotnet-external-provider/pkg/dotnet/provider.go
@@ -65,10 +65,11 @@ func (p *dotnetProvider) Capabilities() []provider.Capability {
 	return caps
 }
 
-func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, error) {
+func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
 	var mode provider.AnalysisMode = provider.AnalysisMode(config.AnalysisMode)
+
 	if mode != provider.SourceOnlyAnalysisMode {
-		return nil, fmt.Errorf("only full analysis is supported")
+		return nil, provider.InitConfig{}, fmt.Errorf("only source analysis is supported")
 	}
 
 	// handle proxy settings
@@ -79,7 +80,7 @@ func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provi
 	codePath, err := filepath.Abs(config.Location)
 	if err != nil {
 		log.Error(err, "unable to get path to analyze")
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 
 	ctx, cancelFunc := context.WithCancel(ctx)
@@ -91,7 +92,7 @@ func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provi
 	lspServerPath, ok := config.ProviderSpecificConfig[provider.LspServerPathConfigKey].(string)
 	if !ok || lspServerPath == "" {
 		cancelFunc()
-		return nil, fmt.Errorf("invalid lspServerPath provided, unable to init dotnet provider")
+		return nil, provider.InitConfig{}, fmt.Errorf("invalid lspServerPath provided, unable to init dotnet provider")
 	}
 
 	cmd := exec.CommandContext(ctx, lspServerPath)
@@ -99,19 +100,19 @@ func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provi
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
 		cancelFunc()
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 	clientWriter := io.MultiWriter(stdin, sentLog)
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		cancelFunc()
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 	clientReader := io.TeeReader(stdout, recvLog)
 	if err := cmd.Start(); err != nil {
 		log.Error(err, "failed to start language server process")
 		cancelFunc()
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 	log.V(2).Info("language server started")
 
@@ -178,7 +179,7 @@ func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provi
 	if err := conn.Notify(ctx, protocol.MethodInitialized, &protocol.InitializedParams{}); err != nil {
 		log.Error(err, "initialized notification failed")
 		cancelFunc()
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 
 	log.Info("waiting for language server to load the project")
@@ -192,5 +193,5 @@ func (p *dotnetProvider) Init(ctx context.Context, log logr.Logger, config provi
 		cmd:        cmd,
 		log:        log,
 		config:     config,
-	}, nil
+	}, provider.InitConfig{}, nil
 }
diff --git a/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go b/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go
index 50e591a1..2354297e 100644
--- a/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go
+++ b/external-providers/generic-external-provider/pkg/generic_external_provider/provider.go
@@ -64,7 +64,7 @@ func (p *genericProvider) Capabilities() []provider.Capability {
 // with the rest of the analyzer-lsp. For example, this Init() function returns
 // a provider.ServiceClient to the original analyzer process. genericProvider
 // here just sort of... doesn't matter at all
-func (p *genericProvider) Init(ctx context.Context, log logr.Logger, c provider.InitConfig) (provider.ServiceClient, error) {
+func (p *genericProvider) Init(ctx context.Context, log logr.Logger, c provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
 	// return nil, fmt.Errorf("nothing")
 
 	log.Error(fmt.Errorf("Nothing"), "Started generic provider init")
@@ -78,7 +78,7 @@ func (p *genericProvider) Init(ctx context.Context, log logr.Logger, c provider.
 		log.Error(fmt.Errorf("lspServerName must be the same for each instantiation of the generic-external-provider (%s != %s)", p.lspServerName, lspServerName), "Inside genericProvider init")
 		fmt.Fprintf(os.Stderr, "lspservername blah")
 
-		return nil, fmt.Errorf("lspServerName must be the same for each instantiation of the generic-external-provider (%s != %s)", p.lspServerName, lspServerName)
+		return nil, provider.InitConfig{}, fmt.Errorf("lspServerName must be the same for each instantiation of the generic-external-provider (%s != %s)", p.lspServerName, lspServerName)
 	}
 
 	// Simple matter of calling the constructor that we set earlier to get the
@@ -87,8 +87,8 @@ func (p *genericProvider) Init(ctx context.Context, log logr.Logger, c provider.
 	if err != nil {
 		log.Error(err, "ctor error")
 		fmt.Fprintf(os.Stderr, "ctor blah")
-		return nil, fmt.Errorf("ctor error: %w", err)
+		return nil, provider.InitConfig{}, fmt.Errorf("ctor error: %w", err)
 	}
 
-	return sc, nil
+	return sc, provider.InitConfig{}, nil
 }
diff --git a/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go b/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go
index f3770f53..72486f5e 100644
--- a/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go
+++ b/external-providers/generic-external-provider/pkg/server_configurations/generic/service_client_test.go
@@ -67,7 +67,7 @@ func TestHopefullyNothingBroke(t *testing.T) {
 
 	goplsExamples := "file://" + filepath.Join(examplesDir, "/golang")
 
-	goplsSC, err := prov.Init(ctx, log, provider.InitConfig{
+	goplsSC, _, err := prov.Init(ctx, log, provider.InitConfig{
 		ProviderSpecificConfig: map[string]interface{}{
 			"lspServerName":    "generic",
 			"lspServerPath":    "gopls",
diff --git a/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go b/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go
index 1f4542cb..a62f4722 100644
--- a/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go
+++ b/external-providers/generic-external-provider/pkg/server_configurations/pylsp/service_client_test.go
@@ -37,7 +37,7 @@ func TestHopefullyNothingBroke(t *testing.T) {
 
 	prov := generic_external_provider.NewGenericProvider("generic", log)
 
-	pylspSC, err := prov.Init(ctx, log, provider.InitConfig{
+	pylspSC, _, err := prov.Init(ctx, log, provider.InitConfig{
 		ProviderSpecificConfig: map[string]interface{}{
 			"lspServerName":     "generic",
 			"lspServerPath":     "pylsp",
diff --git a/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go b/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go
index 08ece087..3ef86084 100644
--- a/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go
+++ b/external-providers/generic-external-provider/pkg/server_configurations/yaml_language_server/service_client_test.go
@@ -33,7 +33,7 @@ func TestHopefullyNothingBroke(t *testing.T) {
 
 	prov := generic_external_provider.NewGenericProvider("yaml_language_server", log)
 
-	yamlSC, err := prov.Init(ctx, log, provider.InitConfig{
+	yamlSC, _, err := prov.Init(ctx, log, provider.InitConfig{
 		ProviderSpecificConfig: map[string]interface{}{
 			"lspServerName":    "yaml_language_server",
 			"lspServerPath":    "node",
diff --git a/external-providers/java-external-provider/pkg/java_external_provider/provider.go b/external-providers/java-external-provider/pkg/java_external_provider/provider.go
index 4d67743b..a06029d2 100644
--- a/external-providers/java-external-provider/pkg/java_external_provider/provider.go
+++ b/external-providers/java-external-provider/pkg/java_external_provider/provider.go
@@ -202,13 +202,17 @@ func symbolKindToString(symbolKind protocol.SymbolKind) string {
 	return ""
 }
 
-func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, error) {
+func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
 	// By default, if nothing is set for analysis mode in the config, we should default to full for external providers
 	var mode provider.AnalysisMode = provider.AnalysisMode(config.AnalysisMode)
+	// in case of a binary, provider decompiles it and returns
+	// a builtin config that points to the decompiled archive
+	additionalBuiltinConfig := provider.InitConfig{}
+
 	if mode == provider.AnalysisMode("") {
 		mode = provider.FullAnalysisMode
 	} else if !(mode == provider.FullAnalysisMode || mode == provider.SourceOnlyAnalysisMode) {
-		return nil, fmt.Errorf("invalid Analysis Mode")
+		return nil, additionalBuiltinConfig, fmt.Errorf("invalid Analysis Mode")
 	}
 	log = log.WithValues("provider", "java")
 
@@ -231,7 +235,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 
 	lspServerPath, ok := config.ProviderSpecificConfig[provider.LspServerPathConfigKey].(string)
 	if !ok || lspServerPath == "" {
-		return nil, fmt.Errorf("invalid lspServerPath provided, unable to init java provider")
+		return nil, additionalBuiltinConfig, fmt.Errorf("invalid lspServerPath provided, unable to init java provider")
 	}
 
 	isBinary := false
@@ -247,13 +251,13 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 		mvnCoordinatesParts := strings.Split(mvnCoordinates, ":")
 		if mvnCoordinates == "" || len(mvnCoordinatesParts) < 3 {
 			cancelFunc()
-			return nil, fmt.Errorf("invalid maven coordinates in location %s, must be in format mvn://<group>:<artifact>:<version>:<classifier>@<path>", config.Location)
+			return nil, additionalBuiltinConfig, fmt.Errorf("invalid maven coordinates in location %s, must be in format mvn://<group>:<artifact>:<version>:<classifier>@<path>", config.Location)
 		}
 		outputDir := "."
 		if destPath != "" {
 			if stat, err := os.Stat(destPath); err != nil || !stat.IsDir() {
 				cancelFunc()
-				return nil, fmt.Errorf("output path does not exist or not a directory")
+				return nil, additionalBuiltinConfig, fmt.Errorf("output path does not exist or not a directory")
 			}
 			outputDir = destPath
 		}
@@ -270,7 +274,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 		cmd.Dir = outputDir
 		if err := cmd.Run(); err != nil {
 			cancelFunc()
-			return nil, fmt.Errorf("error downloading java artifact %s - %w", mvnUri, err)
+			return nil, additionalBuiltinConfig, fmt.Errorf("error downloading java artifact %s - %w", mvnUri, err)
 		}
 		downloadedPath := filepath.Join(outputDir,
 			fmt.Sprintf("%s.jar", strings.Join(mvnCoordinatesParts[1:3], "-")))
@@ -280,7 +284,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 		}
 		if _, err := os.Stat(downloadedPath); err != nil {
 			cancelFunc()
-			return nil, fmt.Errorf("failed to download maven artifact to path %s - %w", downloadedPath, err)
+			return nil, additionalBuiltinConfig, fmt.Errorf("failed to download maven artifact to path %s - %w", downloadedPath, err)
 		}
 		config.Location = downloadedPath
 	}
@@ -292,13 +296,15 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 			config.Location, getMavenLocalRepoPath(mavenSettingsFile))
 		if err != nil {
 			cancelFunc()
-			return nil, err
+			return nil, additionalBuiltinConfig, err
 		}
 		config.Location = sourceLocation
 		// for binaries, we fallback to looking at .jar files only for deps
 		config.DependencyPath = depLocation
 		isBinary = true
 	}
+	additionalBuiltinConfig.Location = config.Location
+	additionalBuiltinConfig.DependencyPath = config.DependencyPath
 
 	// handle proxy settings
 	for k, v := range config.Proxy.ToEnvVars() {
@@ -320,12 +326,12 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 	stdin, err := cmd.StdinPipe()
 	if err != nil {
 		cancelFunc()
-		return nil, err
+		return nil, additionalBuiltinConfig, err
 	}
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		cancelFunc()
-		return nil, err
+		return nil, additionalBuiltinConfig, err
 	}
 
 	go func() {
@@ -391,7 +397,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 	err = svcClient.depInit()
 	if err != nil {
 		cancelFunc()
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 	// Will only set up log follow one time
 	// Will work in container image and hub, will not work
@@ -415,7 +421,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
 			}
 		}()
 	})
-	return &svcClient, returnErr
+	return &svcClient, additionalBuiltinConfig, returnErr
 }
 
 func resolveSourcesJarsForGradle(ctx context.Context, log logr.Logger, location string, _ string, svc *javaServiceClient) error {
diff --git a/external-providers/yq-external-provider/pkg/yq_provider/provider.go b/external-providers/yq-external-provider/pkg/yq_provider/provider.go
index e73d14c2..c3b4085c 100644
--- a/external-providers/yq-external-provider/pkg/yq_provider/provider.go
+++ b/external-providers/yq-external-provider/pkg/yq_provider/provider.go
@@ -65,9 +65,9 @@ type k8skey struct {
 	LineNumber string
 }
 
-func (p *yqProvider) Init(ctx context.Context, log logr.Logger, c provider.InitConfig) (provider.ServiceClient, error) {
+func (p *yqProvider) Init(ctx context.Context, log logr.Logger, c provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
 	if c.AnalysisMode != provider.FullAnalysisMode {
-		return nil, fmt.Errorf("only full analysis is supported")
+		return nil, provider.InitConfig{}, fmt.Errorf("only full analysis is supported")
 	}
 
 	if c.Proxy != nil {
@@ -79,7 +79,7 @@ func (p *yqProvider) Init(ctx context.Context, log logr.Logger, c provider.InitC
 
 	lspServerPath, ok := c.ProviderSpecificConfig[provider.LspServerPathConfigKey].(string)
 	if !ok || lspServerPath == "" {
-		return nil, fmt.Errorf("invalid lspServerPath provided, unable to init yq provider")
+		return nil, provider.InitConfig{}, fmt.Errorf("invalid lspServerPath provided, unable to init yq provider")
 	}
 
 	ctx, cancelFunc := context.WithCancel(ctx)
@@ -88,13 +88,15 @@ func (p *yqProvider) Init(ctx context.Context, log logr.Logger, c provider.InitC
 	if lspArgs, ok := c.ProviderSpecificConfig["lspArgs"]; ok {
 		rawArgs, isArray := lspArgs.([]interface{})
 		if !isArray {
-			return nil, fmt.Errorf("lspArgs is not an array")
+			cancelFunc()
+			return nil, provider.InitConfig{}, fmt.Errorf("lspArgs is not an array")
 		}
 		for _, rawArg := range rawArgs {
 			if arg, ok := rawArg.(string); ok {
 				args = append(args, arg)
 			} else {
-				return nil, fmt.Errorf("item of lspArgs is not a string")
+				cancelFunc()
+				return nil, provider.InitConfig{}, fmt.Errorf("item of lspArgs is not a string")
 			}
 		}
 	}
@@ -116,5 +118,5 @@ func (p *yqProvider) Init(ctx context.Context, log logr.Logger, c provider.InitC
 		config:     c,
 	}
 
-	return &svcClient, nil
+	return &svcClient, provider.InitConfig{}, nil
 }
diff --git a/parser/rule_parser_test.go b/parser/rule_parser_test.go
index ea840166..5b0c0274 100644
--- a/parser/rule_parser_test.go
+++ b/parser/rule_parser_test.go
@@ -24,8 +24,8 @@ func (t testProvider) Capabilities() []provider.Capability {
 	return t.caps
 }
 
-func (t testProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, error) {
-	return nil, nil
+func (t testProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
+	return nil, provider.InitConfig{}, nil
 }
 
 func (t testProvider) Evaluate(ctx context.Context, cap string, conditionInfo []byte) (provider.ProviderEvaluateResponse, error) {
@@ -40,8 +40,8 @@ func (t testProvider) GetDependenciesDAG(ctx context.Context) (map[uri.URI][]pro
 	return nil, nil
 }
 
-func (t testProvider) ProviderInit(context.Context) error {
-	return nil
+func (t testProvider) ProviderInit(context.Context, []provider.InitConfig) ([]provider.InitConfig, error) {
+	return nil, nil
 }
 
 func (t testProvider) Stop() {}
diff --git a/provider/grpc/provider.go b/provider/grpc/provider.go
index eb21ae8c..25f97a95 100644
--- a/provider/grpc/provider.go
+++ b/provider/grpc/provider.go
@@ -147,16 +147,23 @@ func checkServicesRunning(refClt *reflectClient.Client, log logr.Logger) ([]stri
 	}
 }
 
-func (g *grpcProvider) ProviderInit(ctx context.Context) error {
+func (g *grpcProvider) ProviderInit(ctx context.Context, additionalConfigs []provider.InitConfig) ([]provider.InitConfig, error) {
+	builtinConfs := []provider.InitConfig{}
+	if additionalConfigs != nil {
+		g.config.InitConfig = append(g.config.InitConfig, additionalConfigs...)
+	}
 	for _, c := range g.config.InitConfig {
-		s, err := g.Init(ctx, g.log, c)
+		s, builtinConf, err := g.Init(ctx, g.log, c)
 		if err != nil {
 			g.log.Error(err, "Error inside ProviderInit, after g.Init.")
-			return err
+			return nil, err
 		}
 		g.serviceClients = append(g.serviceClients, s)
+		if builtinConf.Location != "" {
+			builtinConfs = append(builtinConfs, builtinConf)
+		}
 	}
-	return nil
+	return builtinConfs, nil
 }
 
 func (g *grpcProvider) Capabilities() []provider.Capability {
@@ -178,10 +185,10 @@ func (g *grpcProvider) Capabilities() []provider.Capability {
 	return c
 }
 
-func (g *grpcProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, error) {
+func (g *grpcProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
 	s, err := structpb.NewStruct(config.ProviderSpecificConfig)
 	if err != nil {
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 
 	c := pb.Config{
@@ -199,16 +206,18 @@ func (g *grpcProvider) Init(ctx context.Context, log logr.Logger, config provide
 	r, err := g.Client.Init(ctx, &c)
 
 	if err != nil {
-		return nil, err
+		return nil, provider.InitConfig{}, err
 	}
 	if !r.Successful {
-		return nil, fmt.Errorf(r.Error)
+		return nil, provider.InitConfig{}, fmt.Errorf(r.Error)
 	}
 	return &grpcServiceClient{
-		id:     r.Id,
-		config: config,
-		client: g.Client,
-	}, nil
+			id:     r.Id,
+			config: config,
+			client: g.Client,
+		}, provider.InitConfig{
+			Location: r.BuiltinConfig.Location,
+		}, nil
 }
 
 func (g *grpcProvider) Evaluate(ctx context.Context, cap string, conditionInfo []byte) (provider.ProviderEvaluateResponse, error) {
diff --git a/provider/internal/builtin/provider.go b/provider/internal/builtin/provider.go
index 654e5736..3f837f0e 100644
--- a/provider/internal/builtin/provider.go
+++ b/provider/internal/builtin/provider.go
@@ -118,24 +118,32 @@ func (p *builtinProvider) Capabilities() []provider.Capability {
 	return caps
 }
 
-func (p *builtinProvider) ProviderInit(ctx context.Context) error {
+func (p *builtinProvider) ProviderInit(ctx context.Context, additionalInitConfigs []provider.InitConfig) ([]provider.InitConfig, error) {
 	// First load all the tags for all init configs.
 	for _, c := range p.config.InitConfig {
 		p.loadTags(c)
 	}
 
+	if additionalInitConfigs != nil {
+		p.config.InitConfig = append(p.config.InitConfig, additionalInitConfigs...)
+	}
+
+	seenLocations := map[string]bool{}
 	for _, c := range p.config.InitConfig {
-		client, err := p.Init(ctx, p.log, c)
-		if err != nil {
-			return nil
+		if _, ok := seenLocations[c.Location]; !ok {
+			client, _, err := p.Init(ctx, p.log, c)
+			if err != nil {
+				return nil, nil
+			}
+			p.clients = append(p.clients, client)
+			seenLocations[c.Location] = true
 		}
-		p.clients = append(p.clients, client)
 	}
-	return nil
+	return nil, nil
 }
 
 // We don't need to init anything
-func (p *builtinProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, error) {
+func (p *builtinProvider) Init(ctx context.Context, log logr.Logger, config provider.InitConfig) (provider.ServiceClient, provider.InitConfig, error) {
 	if config.AnalysisMode != provider.AnalysisMode("") {
 		p.log.V(5).Info("skipping analysis mode setting for builtin")
 	}
@@ -146,7 +154,7 @@ func (p *builtinProvider) Init(ctx context.Context, log logr.Logger, config prov
 		locationCache:                      make(map[string]float64),
 		log:                                log,
 		includedPaths:                      provider.GetIncludedPathsFromConfig(config, true),
-	}, nil
+	}, provider.InitConfig{}, nil
 }
 
 func (p *builtinProvider) loadTags(config provider.InitConfig) error {
diff --git a/provider/internal/grpc/library.pb.go b/provider/internal/grpc/library.pb.go
index 956ed039..a50dc005 100644
--- a/provider/internal/grpc/library.pb.go
+++ b/provider/internal/grpc/library.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.33.0
-// 	protoc        v5.26.1
+// 	protoc-gen-go v1.30.0
+// 	protoc        v5.27.1
 // source: provider/internal/grpc/library.proto
 
 package grpc
@@ -161,9 +161,10 @@ type InitResponse struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Error      string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
-	Successful bool   `protobuf:"varint,2,opt,name=successful,proto3" json:"successful,omitempty"`
-	Id         int64  `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"`
+	Error         string  `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Successful    bool    `protobuf:"varint,2,opt,name=successful,proto3" json:"successful,omitempty"`
+	Id            int64   `protobuf:"varint,3,opt,name=id,proto3" json:"id,omitempty"`
+	BuiltinConfig *Config `protobuf:"bytes,4,opt,name=builtinConfig,proto3" json:"builtinConfig,omitempty"`
 }
 
 func (x *InitResponse) Reset() {
@@ -219,6 +220,13 @@ func (x *InitResponse) GetId() int64 {
 	return 0
 }
 
+func (x *InitResponse) GetBuiltinConfig() *Config {
+	if x != nil {
+		return x.BuiltinConfig
+	}
+	return nil
+}
+
 type ExternalLink struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1563,217 +1571,221 @@ var file_provider_internal_grpc_library_proto_rawDesc = []byte{
 	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x43, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x12, 0x25, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x06, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x50,
-	0x72, 0x6f, 0x78, 0x79, 0x52, 0x05, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x22, 0x54, 0x0a, 0x0c, 0x49,
-	0x6e, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65,
-	0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f,
-	0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75,
-	0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
-	0x64, 0x22, 0x36, 0x0a, 0x0c, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x6e,
-	0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
-	0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x6f, 0x73,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x01, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61,
-	0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x63, 0x68,
-	0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0x7a, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x50, 0x6f, 0x73, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a,
-	0x0b, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x50, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x73, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0xd8, 0x02, 0x0a, 0x0f, 0x49, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55,
-	0x52, 0x49, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52,
-	0x49, 0x12, 0x1b, 0x0a, 0x06, 0x45, 0x66, 0x66, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x48, 0x00, 0x52, 0x06, 0x45, 0x66, 0x66, 0x6f, 0x72, 0x74, 0x88, 0x01, 0x01, 0x12, 0x36,
-	0x0a, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e,
-	0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x4c, 0x6f,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0a, 0x4c, 0x69, 0x6e, 0x65, 0x4e, 0x75,
-	0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x48, 0x01, 0x52, 0x0a, 0x4c, 0x69,
-	0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x09, 0x76,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
+	0x72, 0x6f, 0x78, 0x79, 0x52, 0x05, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x22, 0x8c, 0x01, 0x0a, 0x0c,
+	0x49, 0x6e, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66,
+	0x75, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
+	0x69, 0x64, 0x12, 0x36, 0x0a, 0x0d, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x69, 0x6e, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x62, 0x75, 0x69,
+	0x6c, 0x74, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x36, 0x0a, 0x0c, 0x45, 0x78,
+	0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72,
+	0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05,
+	0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74,
+	0x6c, 0x65, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12,
+	0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x04, 0x6c, 0x69,
+	0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x09, 0x63, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72,
+	0x22, 0x7a, 0x0a, 0x08, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x0d,
+	0x73, 0x74, 0x61, 0x72, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x50,
+	0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x72, 0x74, 0x50, 0x6f,
+	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x0b, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0b, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xd8, 0x02, 0x0a,
+	0x0f, 0x49, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
+	0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x12, 0x1b, 0x0a, 0x06, 0x45, 0x66,
+	0x66, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x06, 0x45, 0x66,
+	0x66, 0x6f, 0x72, 0x74, 0x88, 0x01, 0x01, 0x12, 0x36, 0x0a, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x4c,
+	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x23, 0x0a, 0x0a, 0x4c, 0x69, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x03, 0x48, 0x01, 0x52, 0x0a, 0x4c, 0x69, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x88, 0x01, 0x01, 0x12, 0x35, 0x0a, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
+	0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x2c, 0x0a, 0x05, 0x6c,
+	0x69, 0x6e, 0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f,
+	0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69,
+	0x6e, 0x6b, 0x52, 0x05, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x32, 0x0a, 0x14, 0x49, 0x73, 0x44,
+	0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e,
+	0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x49, 0x73, 0x44, 0x65, 0x70, 0x65, 0x6e,
+	0x64, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a,
+	0x07, 0x5f, 0x45, 0x66, 0x66, 0x6f, 0x72, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x4c, 0x69, 0x6e,
+	0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xbe, 0x01, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x72, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x12, 0x45,
+	0x0a, 0x10, 0x69, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
+	0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x74,
+	0x65, 0x78, 0x74, 0x52, 0x10, 0x69, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e,
+	0x74, 0x65, 0x78, 0x74, 0x73, 0x12, 0x41, 0x0a, 0x0f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
+	0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x09, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-	0x65, 0x73, 0x12, 0x2c, 0x0a, 0x05, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x45, 0x78, 0x74,
-	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x05, 0x6c, 0x69, 0x6e, 0x6b, 0x73,
-	0x12, 0x32, 0x0a, 0x14, 0x49, 0x73, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79,
-	0x49, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14,
-	0x49, 0x73, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x63, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x45, 0x66, 0x66, 0x6f, 0x72, 0x74, 0x42,
-	0x0d, 0x0a, 0x0b, 0x5f, 0x4c, 0x69, 0x6e, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0xbe,
-	0x01, 0x0a, 0x18, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x45, 0x76, 0x61, 0x6c, 0x75,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x64, 0x12, 0x45, 0x0a, 0x10, 0x69, 0x6e, 0x63, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x19, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x63, 0x69, 0x64,
-	0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x10, 0x69, 0x6e, 0x63, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x73, 0x12, 0x41, 0x0a, 0x0f,
-	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0f,
-	0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22,
-	0x45, 0x0a, 0x0d, 0x42, 0x61, 0x73, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x66, 0x75, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x22, 0x59, 0x0a, 0x0f, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x61, 0x70,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x61, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x63,
-	0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69,
-	0x64, 0x22, 0x88, 0x01, 0x0a, 0x10, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a,
-	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x12, 0x3e, 0x0a, 0x08,
-	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x50, 0x0a, 0x14,
-	0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69,
-	0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79,
-	0x52, 0x0c, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x20,
-	0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64,
-	0x22, 0x5e, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x36, 0x0a, 0x0c, 0x63, 0x6f, 0x64, 0x65,
-	0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12,
-	0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x22, 0x60, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63,
-	0x79, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x26, 0x0a, 0x03, 0x64, 0x65, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65,
-	0x6e, 0x63, 0x79, 0x52, 0x03, 0x64, 0x65, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x44, 0x65, 0x70, 0x46,
-	0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x44, 0x65, 0x70, 0x46, 0x69,
-	0x6c, 0x65, 0x22, 0x29, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69,
-	0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6e, 0x69,
-	0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6e, 0x69, 0x70, 0x22, 0x4f, 0x0a,
-	0x1d, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e,
-	0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa9,
-	0x02, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x12, 0x0a,
-	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
-	0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63,
-	0x6c, 0x61, 0x73, 0x73, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
-	0x2e, 0x0a, 0x12, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12,
-	0x24, 0x0a, 0x0d, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x50,
-	0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63,
-	0x74, 0x12, 0x2f, 0x0a, 0x06, 0x65, 0x78, 0x74, 0x72, 0x61, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x65, 0x78, 0x74, 0x72,
-	0x61, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0x3a, 0x0a, 0x0e, 0x44, 0x65,
-	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04,
-	0x64, 0x65, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79,
-	0x52, 0x04, 0x64, 0x65, 0x70, 0x73, 0x22, 0x77, 0x0a, 0x12, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64,
-	0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x12, 0x14, 0x0a, 0x05,
-	0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x12, 0x2b, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x46,
-	0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x22,
-	0x51, 0x0a, 0x07, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69,
-	0x6c, 0x65, 0x55, 0x52, 0x49, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c,
-	0x65, 0x55, 0x52, 0x49, 0x12, 0x2c, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65,
-	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x04, 0x6c, 0x69,
-	0x73, 0x74, 0x22, 0x76, 0x0a, 0x11, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79,
-	0x44, 0x41, 0x47, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x26, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e,
-	0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x39, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x65, 0x64, 0x44, 0x65, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65,
-	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x44, 0x41, 0x47, 0x49, 0x74, 0x65, 0x6d, 0x52,
-	0x09, 0x61, 0x64, 0x64, 0x65, 0x64, 0x44, 0x65, 0x70, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x15, 0x44,
-	0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x44, 0x41, 0x47, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66,
-	0x75, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x66, 0x75, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x34, 0x0a, 0x0a, 0x66, 0x69,
-	0x6c, 0x65, 0x44, 0x61, 0x67, 0x44, 0x65, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
-	0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x41,
-	0x47, 0x44, 0x65, 0x70, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x61, 0x67, 0x44, 0x65, 0x70,
-	0x22, 0x57, 0x0a, 0x0a, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x41, 0x47, 0x44, 0x65, 0x70, 0x12, 0x18,
-	0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x12, 0x2f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74,
-	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x44, 0x41, 0x47, 0x49,
-	0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x5f, 0x0a, 0x05, 0x50, 0x72, 0x6f,
-	0x78, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79,
-	0x12, 0x1e, 0x0a, 0x0a, 0x48, 0x54, 0x54, 0x50, 0x53, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x48, 0x54, 0x54, 0x50, 0x53, 0x50, 0x72, 0x6f, 0x78, 0x79,
-	0x12, 0x18, 0x0a, 0x07, 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x4e, 0x6f, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x32, 0x6b, 0x0a, 0x1b, 0x50, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4c, 0x0a, 0x0b, 0x47, 0x65, 0x74,
-	0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x12, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69,
-	0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x32, 0x8f, 0x01, 0x0a, 0x21, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6a, 0x0a,
-	0x15, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c,
-	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27,
-	0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70,
+	0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x0f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74,
+	0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x45, 0x0a, 0x0d, 0x42, 0x61, 0x73, 0x69,
+	0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12,
+	0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x22,
+	0x59, 0x0a, 0x0f, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x61, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x63, 0x61, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x88, 0x01, 0x0a, 0x10, 0x45,
+	0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x66, 0x75, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x66, 0x75, 0x6c, 0x12, 0x3e, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x2e, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x45, 0x76, 0x61, 0x6c, 0x75,
+	0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x50, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c,
+	0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a,
+	0x0c, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x43,
+	0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x61, 0x62,
+	0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x20, 0x0a, 0x0e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0x5e, 0x0a, 0x12, 0x47, 0x65, 0x74,
+	0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72,
+	0x69, 0x12, 0x36, 0x0a, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x63, 0x6f, 0x64,
+	0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x60, 0x0a, 0x1c, 0x47, 0x65, 0x74,
+	0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x03, 0x64, 0x65, 0x70,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
+	0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x03, 0x64, 0x65,
+	0x70, 0x12, 0x18, 0x0a, 0x07, 0x44, 0x65, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x44, 0x65, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x22, 0x29, 0x0a, 0x13, 0x47,
+	0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6e, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x73, 0x6e, 0x69, 0x70, 0x22, 0x4f, 0x0a, 0x1d, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70,
 	0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x32, 0xb0, 0x03, 0x0a, 0x0f, 0x50, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x48, 0x0a,
-	0x0c, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x16, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
-	0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x32, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74, 0x12,
-	0x10, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x1a, 0x16, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x69,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x08, 0x45,
-	0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x12, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x2e, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x45, 0x76,
-	0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x3a, 0x0a, 0x04, 0x53, 0x74, 0x6f, 0x70, 0x12, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x72, 0x6f, 0x76,
+	0x69, 0x64, 0x65, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c,
+	0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa9, 0x02, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x65,
+	0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65,
+	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x69, 0x66, 0x69,
+	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x72, 0x65, 0x73, 0x6f,
+	0x6c, 0x76, 0x65, 0x64, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x64, 0x49, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x69, 0x6c, 0x65,
+	0x55, 0x52, 0x49, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0d, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x12, 0x1a,
+	0x0a, 0x08, 0x69, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x08, 0x69, 0x6e, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x65, 0x78,
+	0x74, 0x72, 0x61, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72,
+	0x75, 0x63, 0x74, 0x52, 0x06, 0x65, 0x78, 0x74, 0x72, 0x61, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x6c,
+	0x61, 0x62, 0x65, 0x6c, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x73, 0x22, 0x3a, 0x0a, 0x0e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63,
+	0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x65, 0x70, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44,
+	0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x04, 0x64, 0x65, 0x70, 0x73, 0x22,
+	0x77, 0x0a, 0x12, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73,
+	0x66, 0x75, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x66, 0x75, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x2b, 0x0a, 0x07, 0x66,
+	0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70,
+	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x52,
+	0x07, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x65, 0x70, 0x22, 0x51, 0x0a, 0x07, 0x46, 0x69, 0x6c, 0x65,
+	0x44, 0x65, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52, 0x49, 0x12, 0x2c, 0x0a,
+	0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63,
+	0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x76, 0x0a, 0x11, 0x44,
+	0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x44, 0x41, 0x47, 0x49, 0x74, 0x65, 0x6d,
+	0x12, 0x26, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+	0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65,
+	0x6e, 0x63, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x39, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x65,
+	0x64, 0x44, 0x65, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63,
+	0x79, 0x44, 0x41, 0x47, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x09, 0x61, 0x64, 0x64, 0x65, 0x64, 0x44,
+	0x65, 0x70, 0x73, 0x22, 0x83, 0x01, 0x0a, 0x15, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e,
+	0x63, 0x79, 0x44, 0x41, 0x47, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1e, 0x0a,
+	0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0a, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x12, 0x14, 0x0a,
+	0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x12, 0x34, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x61, 0x67, 0x44, 0x65,
+	0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x44, 0x41, 0x47, 0x44, 0x65, 0x70, 0x52, 0x0a, 0x66,
+	0x69, 0x6c, 0x65, 0x44, 0x61, 0x67, 0x44, 0x65, 0x70, 0x22, 0x57, 0x0a, 0x0a, 0x46, 0x69, 0x6c,
+	0x65, 0x44, 0x41, 0x47, 0x44, 0x65, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55,
+	0x52, 0x49, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x55, 0x52,
+	0x49, 0x12, 0x2f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1b, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e,
+	0x64, 0x65, 0x6e, 0x63, 0x79, 0x44, 0x41, 0x47, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69,
+	0x73, 0x74, 0x22, 0x5f, 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x48,
+	0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x48, 0x54, 0x54,
+	0x50, 0x53, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x48,
+	0x54, 0x54, 0x50, 0x53, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x4e, 0x6f, 0x50,
+	0x72, 0x6f, 0x78, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x4e, 0x6f, 0x50, 0x72,
+	0x6f, 0x78, 0x79, 0x32, 0x6b, 0x0a, 0x1b, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x43,
+	0x6f, 0x64, 0x65, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x12, 0x4c, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69,
+	0x70, 0x12, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74,
+	0x43, 0x6f, 0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x1d, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f,
+	0x64, 0x65, 0x53, 0x6e, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x32, 0x8f, 0x01, 0x0a, 0x21, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x44, 0x65, 0x70,
+	0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6a, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70,
+	0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x26, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65,
+	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79,
+	0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x32, 0xb0, 0x03, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x48, 0x0a, 0x0c, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69,
+	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1e,
+	0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69,
+	0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x32, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74, 0x12, 0x10, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x16, 0x2e, 0x70, 0x72, 0x6f,
+	0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x08, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65,
+	0x12, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x45, 0x76, 0x61, 0x6c,
+	0x75, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x70, 0x72,
+	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x45, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x3a, 0x0a, 0x04, 0x53, 0x74, 0x6f,
+	0x70, 0x12, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
+	0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65,
+	0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65,
+	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x12, 0x51, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65,
+	0x6e, 0x63, 0x69, 0x65, 0x73, 0x44, 0x41, 0x47, 0x12, 0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69,
 	0x64, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x0f,
-	0x47, 0x65, 0x74, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x12,
-	0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x70, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x51, 0x0a, 0x12, 0x47, 0x65, 0x74,
-	0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x44, 0x41, 0x47, 0x12,
-	0x18, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x44,
-	0x41, 0x47, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x34, 0x5a, 0x32,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x76, 0x65,
-	0x79, 0x6f, 0x72, 0x2f, 0x61, 0x6e, 0x61, 0x6c, 0x79, 0x7a, 0x65, 0x72, 0x2d, 0x6c, 0x73, 0x70,
-	0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2f, 0x6c, 0x69, 0x62, 0x2f, 0x67, 0x72,
-	0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65,
+	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x79, 0x44, 0x41, 0x47, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x6b, 0x6f, 0x6e, 0x76, 0x65, 0x79, 0x6f, 0x72, 0x2f, 0x61, 0x6e, 0x61,
+	0x6c, 0x79, 0x7a, 0x65, 0x72, 0x2d, 0x6c, 0x73, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x2f, 0x6c, 0x69, 0x62, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1822,47 +1834,48 @@ var file_provider_internal_grpc_library_proto_depIdxs = []int32{
 	25, // 0: provider.Capability.templateContext:type_name -> google.protobuf.Struct
 	25, // 1: provider.Config.providerSpecificConfig:type_name -> google.protobuf.Struct
 	24, // 2: provider.Config.proxy:type_name -> provider.Proxy
-	4,  // 3: provider.Location.startPosition:type_name -> provider.Position
-	4,  // 4: provider.Location.endPosition:type_name -> provider.Position
-	5,  // 5: provider.IncidentContext.codeLocation:type_name -> provider.Location
-	25, // 6: provider.IncidentContext.variables:type_name -> google.protobuf.Struct
-	3,  // 7: provider.IncidentContext.links:type_name -> provider.ExternalLink
-	6,  // 8: provider.ProviderEvaluateResponse.incidentContexts:type_name -> provider.IncidentContext
-	25, // 9: provider.ProviderEvaluateResponse.templateContext:type_name -> google.protobuf.Struct
-	7,  // 10: provider.EvaluateResponse.response:type_name -> provider.ProviderEvaluateResponse
-	0,  // 11: provider.CapabilitiesResponse.capabilities:type_name -> provider.Capability
-	5,  // 12: provider.GetCodeSnipRequest.codeLocation:type_name -> provider.Location
-	17, // 13: provider.GetDependencyLocationRequest.dep:type_name -> provider.Dependency
-	5,  // 14: provider.GetDependencyLocationResponse.location:type_name -> provider.Location
-	25, // 15: provider.Dependency.extras:type_name -> google.protobuf.Struct
-	17, // 16: provider.DependencyList.deps:type_name -> provider.Dependency
-	20, // 17: provider.DependencyResponse.fileDep:type_name -> provider.FileDep
-	18, // 18: provider.FileDep.list:type_name -> provider.DependencyList
-	17, // 19: provider.DependencyDAGItem.key:type_name -> provider.Dependency
-	21, // 20: provider.DependencyDAGItem.addedDeps:type_name -> provider.DependencyDAGItem
-	23, // 21: provider.DependencyDAGResponse.fileDagDep:type_name -> provider.FileDAGDep
-	21, // 22: provider.FileDAGDep.list:type_name -> provider.DependencyDAGItem
-	13, // 23: provider.ProviderCodeLocationService.GetCodeSnip:input_type -> provider.GetCodeSnipRequest
-	14, // 24: provider.ProviderDependencyLocationService.GetDependencyLocation:input_type -> provider.GetDependencyLocationRequest
-	26, // 25: provider.ProviderService.Capabilities:input_type -> google.protobuf.Empty
-	1,  // 26: provider.ProviderService.Init:input_type -> provider.Config
-	9,  // 27: provider.ProviderService.Evaluate:input_type -> provider.EvaluateRequest
-	12, // 28: provider.ProviderService.Stop:input_type -> provider.ServiceRequest
-	12, // 29: provider.ProviderService.GetDependencies:input_type -> provider.ServiceRequest
-	12, // 30: provider.ProviderService.GetDependenciesDAG:input_type -> provider.ServiceRequest
-	15, // 31: provider.ProviderCodeLocationService.GetCodeSnip:output_type -> provider.GetCodeSnipResponse
-	16, // 32: provider.ProviderDependencyLocationService.GetDependencyLocation:output_type -> provider.GetDependencyLocationResponse
-	11, // 33: provider.ProviderService.Capabilities:output_type -> provider.CapabilitiesResponse
-	2,  // 34: provider.ProviderService.Init:output_type -> provider.InitResponse
-	10, // 35: provider.ProviderService.Evaluate:output_type -> provider.EvaluateResponse
-	26, // 36: provider.ProviderService.Stop:output_type -> google.protobuf.Empty
-	19, // 37: provider.ProviderService.GetDependencies:output_type -> provider.DependencyResponse
-	22, // 38: provider.ProviderService.GetDependenciesDAG:output_type -> provider.DependencyDAGResponse
-	31, // [31:39] is the sub-list for method output_type
-	23, // [23:31] is the sub-list for method input_type
-	23, // [23:23] is the sub-list for extension type_name
-	23, // [23:23] is the sub-list for extension extendee
-	0,  // [0:23] is the sub-list for field type_name
+	1,  // 3: provider.InitResponse.builtinConfig:type_name -> provider.Config
+	4,  // 4: provider.Location.startPosition:type_name -> provider.Position
+	4,  // 5: provider.Location.endPosition:type_name -> provider.Position
+	5,  // 6: provider.IncidentContext.codeLocation:type_name -> provider.Location
+	25, // 7: provider.IncidentContext.variables:type_name -> google.protobuf.Struct
+	3,  // 8: provider.IncidentContext.links:type_name -> provider.ExternalLink
+	6,  // 9: provider.ProviderEvaluateResponse.incidentContexts:type_name -> provider.IncidentContext
+	25, // 10: provider.ProviderEvaluateResponse.templateContext:type_name -> google.protobuf.Struct
+	7,  // 11: provider.EvaluateResponse.response:type_name -> provider.ProviderEvaluateResponse
+	0,  // 12: provider.CapabilitiesResponse.capabilities:type_name -> provider.Capability
+	5,  // 13: provider.GetCodeSnipRequest.codeLocation:type_name -> provider.Location
+	17, // 14: provider.GetDependencyLocationRequest.dep:type_name -> provider.Dependency
+	5,  // 15: provider.GetDependencyLocationResponse.location:type_name -> provider.Location
+	25, // 16: provider.Dependency.extras:type_name -> google.protobuf.Struct
+	17, // 17: provider.DependencyList.deps:type_name -> provider.Dependency
+	20, // 18: provider.DependencyResponse.fileDep:type_name -> provider.FileDep
+	18, // 19: provider.FileDep.list:type_name -> provider.DependencyList
+	17, // 20: provider.DependencyDAGItem.key:type_name -> provider.Dependency
+	21, // 21: provider.DependencyDAGItem.addedDeps:type_name -> provider.DependencyDAGItem
+	23, // 22: provider.DependencyDAGResponse.fileDagDep:type_name -> provider.FileDAGDep
+	21, // 23: provider.FileDAGDep.list:type_name -> provider.DependencyDAGItem
+	13, // 24: provider.ProviderCodeLocationService.GetCodeSnip:input_type -> provider.GetCodeSnipRequest
+	14, // 25: provider.ProviderDependencyLocationService.GetDependencyLocation:input_type -> provider.GetDependencyLocationRequest
+	26, // 26: provider.ProviderService.Capabilities:input_type -> google.protobuf.Empty
+	1,  // 27: provider.ProviderService.Init:input_type -> provider.Config
+	9,  // 28: provider.ProviderService.Evaluate:input_type -> provider.EvaluateRequest
+	12, // 29: provider.ProviderService.Stop:input_type -> provider.ServiceRequest
+	12, // 30: provider.ProviderService.GetDependencies:input_type -> provider.ServiceRequest
+	12, // 31: provider.ProviderService.GetDependenciesDAG:input_type -> provider.ServiceRequest
+	15, // 32: provider.ProviderCodeLocationService.GetCodeSnip:output_type -> provider.GetCodeSnipResponse
+	16, // 33: provider.ProviderDependencyLocationService.GetDependencyLocation:output_type -> provider.GetDependencyLocationResponse
+	11, // 34: provider.ProviderService.Capabilities:output_type -> provider.CapabilitiesResponse
+	2,  // 35: provider.ProviderService.Init:output_type -> provider.InitResponse
+	10, // 36: provider.ProviderService.Evaluate:output_type -> provider.EvaluateResponse
+	26, // 37: provider.ProviderService.Stop:output_type -> google.protobuf.Empty
+	19, // 38: provider.ProviderService.GetDependencies:output_type -> provider.DependencyResponse
+	22, // 39: provider.ProviderService.GetDependenciesDAG:output_type -> provider.DependencyDAGResponse
+	32, // [32:40] is the sub-list for method output_type
+	24, // [24:32] is the sub-list for method input_type
+	24, // [24:24] is the sub-list for extension type_name
+	24, // [24:24] is the sub-list for extension extendee
+	0,  // [0:24] is the sub-list for field type_name
 }
 
 func init() { file_provider_internal_grpc_library_proto_init() }
diff --git a/provider/internal/grpc/library.proto b/provider/internal/grpc/library.proto
index aae0efc6..9af14617 100644
--- a/provider/internal/grpc/library.proto
+++ b/provider/internal/grpc/library.proto
@@ -29,6 +29,7 @@ message InitResponse {
   string error = 1 ;
   bool successful = 2;
   int64 id = 3;
+  Config builtinConfig = 4;
 }
 
 message ExternalLink {
diff --git a/provider/internal/grpc/library_grpc.pb.go b/provider/internal/grpc/library_grpc.pb.go
index 937b30e5..5a0a6247 100644
--- a/provider/internal/grpc/library_grpc.pb.go
+++ b/provider/internal/grpc/library_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.3.0
-// - protoc             v5.26.1
+// - protoc             v5.27.1
 // source: provider/internal/grpc/library.proto
 
 package grpc
diff --git a/provider/provider.go b/provider/provider.go
index e23d9e7e..3e0446ee 100644
--- a/provider/provider.go
+++ b/provider/provider.go
@@ -400,9 +400,10 @@ func FullDepDAGResponse(ctx context.Context, clients []ServiceClient) (map[uri.U
 }
 
 // InternalInit interface is going to be used to init the full config of a provider.
-// used by the engine/analyzer to get a provider ready.
+// used by the engine/analyzer to get a provider ready. It takes additional init
+// configs that may be returned by other providers when they are initialized
 type InternalInit interface {
-	ProviderInit(context.Context) error
+	ProviderInit(context.Context, []InitConfig) ([]InitConfig, error)
 }
 
 type InternalProviderClient interface {
@@ -417,7 +418,8 @@ type Client interface {
 
 type BaseClient interface {
 	Capabilities() []Capability
-	Init(context.Context, logr.Logger, InitConfig) (ServiceClient, error)
+	// Init initiates and returns a service client along with additional init config for the builtin provider
+	Init(context.Context, logr.Logger, InitConfig) (ServiceClient, InitConfig, error)
 }
 
 // For some period of time during POC this will be in tree, in the future we need to write something that can do this w/ external binaries
diff --git a/provider/provider_test.go b/provider/provider_test.go
index e9e638db..7e866dc5 100644
--- a/provider/provider_test.go
+++ b/provider/provider_test.go
@@ -24,8 +24,8 @@ func (c *fakeClient) HasCapability(string) bool  { return true }
 func (c *fakeClient) Evaluate(context.Context, string, []byte) (ProviderEvaluateResponse, error) {
 	return ProviderEvaluateResponse{}, nil
 }
-func (c *fakeClient) Init(context.Context, logr.Logger, InitConfig) (ServiceClient, error) {
-	return nil, nil
+func (c *fakeClient) Init(context.Context, logr.Logger, InitConfig) (ServiceClient, InitConfig, error) {
+	return nil, InitConfig{}, nil
 }
 func (c *fakeClient) Stop() {}
 
diff --git a/provider/server.go b/provider/server.go
index 82eae0eb..96569b71 100644
--- a/provider/server.go
+++ b/provider/server.go
@@ -243,7 +243,7 @@ func (s *server) Init(ctx context.Context, config *libgrpc.Config) (*libgrpc.Ini
 	log := s.Log.WithValues("client", id)
 	newCtx := context.Background()
 
-	client, err := s.Client.Init(newCtx, log, c)
+	client, builtinConf, err := s.Client.Init(newCtx, log, c)
 	if err != nil {
 		return &libgrpc.InitResponse{
 			Error:      err.Error(),
@@ -257,9 +257,16 @@ func (s *server) Init(ctx context.Context, config *libgrpc.Config) (*libgrpc.Ini
 	}
 	s.mutex.Unlock()
 
+	builtinRpcConf := &libgrpc.Config{}
+	if builtinConf.Location != "" {
+		builtinRpcConf.Location = builtinConf.Location
+		builtinRpcConf.DependencyPath = builtinConf.DependencyPath
+	}
+
 	return &libgrpc.InitResponse{
-		Id:         id,
-		Successful: true,
+		Id:            id,
+		BuiltinConfig: builtinRpcConf,
+		Successful:    true,
 	}, nil
 }
 
diff --git a/provider_container_settings.json b/provider_container_settings.json
index d3f031e3..f68b7bd9 100644
--- a/provider_container_settings.json
+++ b/provider_container_settings.json
@@ -113,7 +113,7 @@
                 "analysisMode": "source-only"
             },
             {
-                "location": "mvn://io.javaoperatorsdk:quarkus:1.6.2:jar",
+                "location": "mvn://io.javaoperatorsdk:quarkus:1.6.2:jar@/analyzer-lsp/examples/",
                 "providerSpecificConfig": {
                     "lspServerName": "java",
                     "lspServerPath": "/jdtls/bin/jdtls",
diff --git a/provider_local_external_images.json b/provider_local_external_images.json
index 1889001a..39d267bf 100644
--- a/provider_local_external_images.json
+++ b/provider_local_external_images.json
@@ -113,7 +113,7 @@
                 "analysisMode": "source-only"
             },
             {
-                "location": "mvn://io.javaoperatorsdk:quarkus:1.6.2:jar",
+                "location": "mvn://io.javaoperatorsdk:quarkus:1.6.2:jar@examples/",
                 "providerSpecificConfig": {
                     "lspServerName": "java",
                     "lspServerPath": "/jdtls/bin/jdtls",
diff --git a/provider_pod_local_settings.json b/provider_pod_local_settings.json
index 116525f7..c1251307 100644
--- a/provider_pod_local_settings.json
+++ b/provider_pod_local_settings.json
@@ -113,7 +113,7 @@
                 "analysisMode": "source-only"
             },
             {
-                "location": "mvn://io.javaoperatorsdk:quarkus:1.6.2:jar",
+                "location": "mvn://io.javaoperatorsdk:quarkus:1.6.2:jar@/analyzer-lsp/examples/",
                 "providerSpecificConfig": {
                     "lspServerName": "java",
                     "lspServerPath": "/jdtls/bin/jdtls",

From 513fafd93fd46418ddd7d198f357ff3607a31a38 Mon Sep 17 00:00:00 2001
From: Pranav Gaikwad <pgaikwad@redhat.com>
Date: Thu, 11 Jul 2024 13:32:43 -0400
Subject: [PATCH 2/5] :bug: fix github workflow to use external provider images

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
---
 .github/workflows/demo-testing.yml | 23 +++++++++++++++++---
 Makefile                           | 35 +++++++++++++++++-------------
 demo-output.yaml                   | 16 +-------------
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/demo-testing.yml b/.github/workflows/demo-testing.yml
index 2c8eb7a9..c88c7384 100644
--- a/.github/workflows/demo-testing.yml
+++ b/.github/workflows/demo-testing.yml
@@ -2,6 +2,11 @@ name: Demo Testing
 
 on: ["push", "pull_request"]
 
+env:
+  IMG_JAVA_PROVIDER: quay.io/konveyor/java-external-provider:latest
+  IMG_DOTNET_PROVIDER: quay.io/konveyor/dotnet-external-provider:latest
+  IMG_GENERIC_PROVIDER: quay.io/konveyor/generic-external-provider:latest
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -62,13 +67,21 @@ jobs:
       # build all provider images and the analyzer-lsp image
       - name: build images
         run: |
-          make build-external
+          make \
+            IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
+            IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
+            IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
+            build-external
           podman build -t quay.io/konveyor/analyzer-lsp:latest -f Dockerfile .
 
       # run the demo in a podman pod
       - name: run demo image
         run : |
-          make run-external-providers-pod
+          make \
+            IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
+            IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
+            IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
+            run-external-providers-pod
           podman build -f demo-local.Dockerfile -t localhost/testing:latest
           make run-demo-image
       
@@ -95,7 +108,11 @@ jobs:
         working-directory: tackle2-addon-analyzer
         run: |
           IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-podman
-          podman save -o /tmp/tackle2-addon-analyzer.tar quay.io/konveyor/tackle2-addon-analyzer:latest
+          podman save -o /tmp/tackle2-addon-analyzer.tar \
+            quay.io/konveyor/tackle2-addon-analyzer:latest \
+            $IMG_JAVA_PROVIDER \
+            $IMG_GENERIC_PROVIDER \
+            $IMG_DOTNET_PROVIDER
 
       - name: Upload image as artifact
         uses: actions/upload-artifact@v3
diff --git a/Makefile b/Makefile
index 13355d3a..59cefe95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
 DOCKER_IMAGE = test
+IMG_JAVA_PROVIDER ?= java-provider
+IMG_DOTNET_PROVIDER ?= dotnet-provider
+IMG_GENERIC_PROVIDER ?= generic-provider
+IMG_GO_DEP_PROVIDER ?= golang-dep-provider
+IMG_YQ_PROVIDER ?= yq-provider
 OS := $(shell uname -s)
 ifeq ($(OS),Linux)
 	MOUNT_OPT := :z
@@ -32,27 +37,27 @@ image-build:
 build-external: build-dotnet-provider build-golang-dep-provider build-generic-provider build-java-provider build-yq-provider
 
 build-dotnet-provider:
-	podman build -f external-providers/dotnet-external-provider/Dockerfile -t dotnet-provider .
+	podman build -f external-providers/dotnet-external-provider/Dockerfile -t $(IMG_DOTNET_PROVIDER) .
 
 build-generic-provider:
 	sed -i 's,quay.io/konveyor/golang-dependency-provider,golang-dep-provider,g' external-providers/generic-external-provider/Dockerfile
-	podman build -f external-providers/generic-external-provider/Dockerfile -t generic-provider .
+	podman build -f external-providers/generic-external-provider/Dockerfile -t $(IMG_GENERIC_PROVIDER) .
 
 build-golang-dep-provider:
-	podman build -f external-providers/golang-dependency-provider/Dockerfile -t golang-dep-provider .
+	podman build -f external-providers/golang-dependency-provider/Dockerfile -t $(IMG_GO_DEP_PROVIDER) .
 
 build-java-provider:
-	podman build -f external-providers/java-external-provider/Dockerfile -t java-provider .
+	podman build -f external-providers/java-external-provider/Dockerfile -t $(IMG_JAVA_PROVIDER) .
 
 build-yq-provider:
-	podman build -f external-providers/yq-external-provider/Dockerfile -t yq-provider .
+	podman build -f external-providers/yq-external-provider/Dockerfile -t $(IMG_YQ_PROVIDER) .
 
 run-external-providers-local:
-	podman run --name java-provider -d -p 14651:14651 -v $(PWD)/external-providers/java-external-provider/examples:/examples$(MOUNT_OPT) java-provider --port 14651
-	podman run --name yq -d -p 14652:14652 -v $(PWD)/examples:/examples yq-provider$(MOUNT_OPT) --port 14652
-	podman run --name golang-provider -d -p 14653:14653 -v $(PWD)/examples:/examples$(MOUNT_OPT) generic-provider --port 14653
-	podman run --name nodejs -d -p 14654:14654 -v $(PWD)/examples:/examples$(MOUNT_OPT) generic-provider --port 14654 --name nodejs
-	podman run --name python -d -p 14655:14655 -v $(PWD)/examples:/examples$(MOUNT_OPT) generic-provider --port 14655 --name pylsp
+	podman run --name java-provider -d -p 14651:14651 -v $(PWD)/external-providers/java-external-provider/examples:/examples$(MOUNT_OPT) $(IMG_JAVA_PROVIDER) --port 14651
+	podman run --name yq -d -p 14652:14652 -v $(PWD)/examples:/examples $(IMG_YQ_PROVIDER)$(MOUNT_OPT) --port 14652
+	podman run --name golang-provider -d -p 14653:14653 -v $(PWD)/examples:/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14653
+	podman run --name nodejs -d -p 14654:14654 -v $(PWD)/examples:/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14654 --name nodejs
+	podman run --name python -d -p 14655:14655 -v $(PWD)/examples:/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14655 --name pylsp
 
 stop-external-providers:
 	podman kill java-provider || true
@@ -74,11 +79,11 @@ run-external-providers-pod:
 	podman run --rm -v test-data:/target$(MOUNT_OPT) -v $(PWD)/external-providers/java-external-provider/examples:/src/$(MOUNT_OPT) --entrypoint=cp alpine -a /src/. /target/
 	# run pods w/ defined ports for the test volumes
 	podman pod create --name=analyzer
-	podman run --pod analyzer --name java-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) java-provider --port 14651
-	podman run --pod analyzer --name yq -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) yq-provider --port 14652
-	podman run --pod analyzer --name golang-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) generic-provider --port 14653
-	podman run --pod analyzer --name nodejs -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) generic-provider --port 14654 --name nodejs
-	podman run --pod analyzer --name python -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) generic-provider --port 14655 --name pylsp
+	podman run --pod analyzer --name java-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_JAVA_PROVIDER) --port 14651
+	podman run --pod analyzer --name yq -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_YQ_PROVIDER) --port 14652
+	podman run --pod analyzer --name golang-provider -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14653
+	podman run --pod analyzer --name nodejs -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14654 --name nodejs
+	podman run --pod analyzer --name python -d -v test-data:/analyzer-lsp/examples$(MOUNT_OPT) $(IMG_GENERIC_PROVIDER) --port 14655 --name pylsp
 	podman build -f demo-local.Dockerfile -t localhost/testing:latest
 
 run-demo-image:
diff --git a/demo-output.yaml b/demo-output.yaml
index 9d0873a3..941d58b8 100644
--- a/demo-output.yaml
+++ b/demo-output.yaml
@@ -533,21 +533,6 @@
           name: io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
           package: com.example.apps
       effort: 1
-    lang-ref-004:
-      description: ""
-      category: potential
-      incidents:
-      - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java
-        message: found generic call
-        codeSnip: " 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {\n14          CustomResourceDefinition crd = new CustomResourceDefinition();\n15          System.out.println( crd );\n16  \n17          GenericClass<String> element = new GenericClass<String>(\"Hello world!\");\n18          element.get();\n19      }\n20  }\n"
-        lineNumber: 18
-        variables:
-          VariableName: element
-          file: file:///examples/java/example/src/main/java/com/example/apps/App.java
-          kind: Method
-          name: main
-          package: com.example.apps
-      effort: 1
     maven-javax-to-jakarta-00002:
       description: Move to Jakarta EE Maven Artifacts - replace groupId javax.activation
       category: potential
@@ -1149,4 +1134,5 @@
   unmatched:
   - file-002
   - lang-ref-002
+  - lang-ref-004
   - python-sample-rule-003

From 1e192fb8e788e6b0b512e12698b01334c926a917 Mon Sep 17 00:00:00 2001
From: Pranav Gaikwad <pgaikwad@redhat.com>
Date: Wed, 17 Jul 2024 11:18:57 -0400
Subject: [PATCH 3/5] remove default builtin config

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
---
 demo-output.yaml          | 16 +++++++++++++++-
 provider/grpc/provider.go | 14 ++++++++------
 provider/provider.go      |  7 -------
 provider/provider_test.go |  4 ++--
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/demo-output.yaml b/demo-output.yaml
index 941d58b8..9d0873a3 100644
--- a/demo-output.yaml
+++ b/demo-output.yaml
@@ -533,6 +533,21 @@
           name: io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition
           package: com.example.apps
       effort: 1
+    lang-ref-004:
+      description: ""
+      category: potential
+      incidents:
+      - uri: file:///examples/java/example/src/main/java/com/example/apps/App.java
+        message: found generic call
+        codeSnip: " 8      /**\n 9       * {@link CustomResourceDefinition}\n10       * @param args\n11       */\n12      public static void main( String[] args )\n13      {\n14          CustomResourceDefinition crd = new CustomResourceDefinition();\n15          System.out.println( crd );\n16  \n17          GenericClass<String> element = new GenericClass<String>(\"Hello world!\");\n18          element.get();\n19      }\n20  }\n"
+        lineNumber: 18
+        variables:
+          VariableName: element
+          file: file:///examples/java/example/src/main/java/com/example/apps/App.java
+          kind: Method
+          name: main
+          package: com.example.apps
+      effort: 1
     maven-javax-to-jakarta-00002:
       description: Move to Jakarta EE Maven Artifacts - replace groupId javax.activation
       category: potential
@@ -1134,5 +1149,4 @@
   unmatched:
   - file-002
   - lang-ref-002
-  - lang-ref-004
   - python-sample-rule-003
diff --git a/provider/grpc/provider.go b/provider/grpc/provider.go
index 25f97a95..47226fd7 100644
--- a/provider/grpc/provider.go
+++ b/provider/grpc/provider.go
@@ -211,13 +211,15 @@ func (g *grpcProvider) Init(ctx context.Context, log logr.Logger, config provide
 	if !r.Successful {
 		return nil, provider.InitConfig{}, fmt.Errorf(r.Error)
 	}
+	additionalBuiltinConfig := provider.InitConfig{}
+	if r.BuiltinConfig != nil {
+		additionalBuiltinConfig.Location = r.BuiltinConfig.Location
+	}
 	return &grpcServiceClient{
-			id:     r.Id,
-			config: config,
-			client: g.Client,
-		}, provider.InitConfig{
-			Location: r.BuiltinConfig.Location,
-		}, nil
+		id:     r.Id,
+		config: config,
+		client: g.Client,
+	}, additionalBuiltinConfig, nil
 }
 
 func (g *grpcProvider) Evaluate(ctx context.Context, cap string, conditionInfo []byte) (provider.ProviderEvaluateResponse, error) {
diff --git a/provider/provider.go b/provider/provider.go
index 3e0446ee..6dbdb507 100644
--- a/provider/provider.go
+++ b/provider/provider.go
@@ -157,12 +157,8 @@ func GetConfig(filepath string) ([]Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	foundBuiltin := false
 	for idx := range configs {
 		c := &configs[idx]
-		if c.Name == builtinConfig.Name {
-			foundBuiltin = true
-		}
 		// default to system-wide proxy
 		if c.Proxy == nil {
 			c.Proxy = (*Proxy)(httpproxy.FromEnvironment())
@@ -182,9 +178,6 @@ func GetConfig(filepath string) ([]Config, error) {
 
 		}
 	}
-	if !foundBuiltin {
-		configs = append(configs, builtinConfig)
-	}
 
 	// Validate provider names for duplicate providers.
 	if err := validateProviderName(configs); err != nil {
diff --git a/provider/provider_test.go b/provider/provider_test.go
index 7e866dc5..b53e1b8a 100644
--- a/provider/provider_test.go
+++ b/provider/provider_test.go
@@ -396,8 +396,8 @@ func Test_GetConfigs(t *testing.T) {
 				return
 			}
 			// This is true because of the builtin config that will be added if not there
-			if len(config) != 2 {
-				t.Fatalf("got config longer than one: %v", len(config))
+			if len(config) != 1 {
+				t.Fatalf("got config not equal to one: %v", len(config))
 			}
 			c := config[0]
 			if len(c.InitConfig) != 1 {

From ed23116232773eb57c0fb1b6fcf45cfb0f8cc8d4 Mon Sep 17 00:00:00 2001
From: Pranav Gaikwad <pgaikwad@redhat.com>
Date: Thu, 18 Jul 2024 11:11:31 -0400
Subject: [PATCH 4/5] :bug: fix default builtin configs

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>

fixup
---
 .github/workflows/demo-testing.yml | 42 ++++++++++++++--------------
 cmd/analyzer/main.go               | 44 +++++++++++++++++++++++++-----
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/demo-testing.yml b/.github/workflows/demo-testing.yml
index c88c7384..d055e827 100644
--- a/.github/workflows/demo-testing.yml
+++ b/.github/workflows/demo-testing.yml
@@ -3,9 +3,9 @@ name: Demo Testing
 on: ["push", "pull_request"]
 
 env:
-  IMG_JAVA_PROVIDER: quay.io/konveyor/java-external-provider:latest
-  IMG_DOTNET_PROVIDER: quay.io/konveyor/dotnet-external-provider:latest
-  IMG_GENERIC_PROVIDER: quay.io/konveyor/generic-external-provider:latest
+  IMG_JAVA_PROVIDER: ttl.sh/konveyor-java-external-provider:2hr
+  IMG_DOTNET_PROVIDER: ttl.sh/konveyor-dotnet-external-provider:2h
+  IMG_GENERIC_PROVIDER: ttl.sh/konveyor-generic-external-provider:2h
 
 jobs:
   test:
@@ -101,29 +101,31 @@ jobs:
         with:
           fetch-depth: 0
           repository: konveyor/tackle2-addon-analyzer
-          ref: ${{ steps.extract-info.outputs.ADDON_REF }}
+          ref: refs/pull/97/merge
           path: tackle2-addon-analyzer
 
-      - name: Build addon and save image
+      - name: Build addon and push images
         working-directory: tackle2-addon-analyzer
         run: |
-          IMG=quay.io/konveyor/tackle2-addon-analyzer:latest make image-podman
-          podman save -o /tmp/tackle2-addon-analyzer.tar \
-            quay.io/konveyor/tackle2-addon-analyzer:latest \
-            $IMG_JAVA_PROVIDER \
-            $IMG_GENERIC_PROVIDER \
-            $IMG_DOTNET_PROVIDER
-
-      - name: Upload image as artifact
-        uses: actions/upload-artifact@v3
+          IMG=ttl.sh/konveyor-tackle2-addon-analyzer:2h make image-podman
+          podman push ttl.sh/konveyor-tackle2-addon-analyzer:2h
+          podman push $IMG_JAVA_PROVIDER
+          podman push $IMG_DOTNET_PROVIDER
+          podman push $IMG_GENERIC_PROVIDER
+      
+      - name: Make bundle image
+        uses: konveyor/operator/.github/actions/make-bundle@main
         with:
-          name: tackle2-addon-analyzer
-          path: /tmp/tackle2-addon-analyzer.tar
-          retention-days: 1
-
+          operator_bundle: ttl.sh/konveyor-operator-bundle-shawn-test:2h
+          addon_analyzer: ttl.sh/konveyor-tackle2-addon-analyzer:2h
+          provider_generic: ${{ env.IMG_GENERIC_PROVIDER }}
+          provider_java: ${{ env.IMG_JAVA_PROVIDER}}
+      - name: push bundle image 
+        run: |
+          podman push ttl.sh/konveyor-operator-bundle-shawn-test:2h
   e2e:
     needs: test
-    uses: konveyor/ci/.github/workflows/global-ci.yml@main
+    uses: konveyor/ci/.github/workflows/global-ci-bundle.yml@main
     with:
-      component_name: tackle2-addon-analyzer
+      operator_bundle: ttl.sh/konveyor-operator-bundle-shawn-test:2h
       api_tests_ref: "${{ needs.test.outputs.api_tests_ref }}"
diff --git a/cmd/analyzer/main.go b/cmd/analyzer/main.go
index a5aee3ce..111bc9e0 100644
--- a/cmd/analyzer/main.go
+++ b/cmd/analyzer/main.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
@@ -127,10 +128,41 @@ func AnalysisCmd() *cobra.Command {
 				os.Exit(1)
 			}
 
+			// we add builtin configs by default for all locations
+			defaultBuiltinConfigs := []provider.InitConfig{}
+			seenBuiltinConfigs := map[string]bool{}
+			finalConfigs := []provider.Config{}
+			for _, config := range configs {
+				if config.Name != "builtin" {
+					finalConfigs = append(finalConfigs, config)
+				}
+				for _, initConf := range config.InitConfig {
+					if _, ok := seenBuiltinConfigs[initConf.Location]; !ok {
+						if initConf.Location != "" {
+							if stat, err := os.Stat(initConf.Location); err == nil && stat.IsDir() {
+								builtinLocation, err := filepath.Abs(initConf.Location)
+								if err != nil {
+									builtinLocation = initConf.Location
+								}
+								seenBuiltinConfigs[builtinLocation] = true
+								builtinConf := provider.InitConfig{Location: builtinLocation}
+								if config.Name == "builtin" {
+									builtinConf.ProviderSpecificConfig = initConf.ProviderSpecificConfig
+								}
+								defaultBuiltinConfigs = append(defaultBuiltinConfigs, builtinConf)
+							}
+						}
+					}
+				}
+			}
+			finalConfigs = append(finalConfigs, provider.Config{
+				Name:       "builtin",
+				InitConfig: defaultBuiltinConfigs,
+			})
+
 			providers := map[string]provider.InternalProviderClient{}
-			builtinConfigs := []provider.InitConfig{}
 			providerLocations := []string{}
-			for _, config := range configs {
+			for _, config := range finalConfigs {
 				config.ContextLines = contextLines
 				for _, ind := range config.InitConfig {
 					providerLocations = append(providerLocations, ind.Location)
@@ -141,9 +173,6 @@ func AnalysisCmd() *cobra.Command {
 					for _, i := range config.InitConfig {
 						i.AnalysisMode = provider.AnalysisMode(analysisMode)
 						inits = append(inits, i)
-						builtinConfigs = append(builtinConfigs, provider.InitConfig{
-							Location: i.Location,
-						})
 					}
 					config.InitConfig = inits
 				}
@@ -208,6 +237,7 @@ func AnalysisCmd() *cobra.Command {
 				}
 			}
 			// Now that we have all the providers, we need to start them.
+			additionalBuiltinConfigs := []provider.InitConfig{}
 			for name, provider := range needProviders {
 				switch name {
 				// other providers can return additional configs for the builtin provider
@@ -223,14 +253,14 @@ func AnalysisCmd() *cobra.Command {
 						os.Exit(1)
 					}
 					if additionalBuiltinConfs != nil {
-						builtinConfigs = append(builtinConfigs, additionalBuiltinConfs...)
+						additionalBuiltinConfigs = append(additionalBuiltinConfigs, additionalBuiltinConfs...)
 					}
 					initSpan.End()
 				}
 			}
 
 			if builtinClient, ok := needProviders["builtin"]; ok {
-				if _, err = builtinClient.ProviderInit(ctx, builtinConfigs); err != nil {
+				if _, err = builtinClient.ProviderInit(ctx, additionalBuiltinConfigs); err != nil {
 					errLog.Error(err, "unable to init builtin provider")
 					os.Exit(1)
 				}

From 50874512a5346845e3d3eca79503fd0b6351b05a Mon Sep 17 00:00:00 2001
From: Shawn Hurley <shawn@hurley.page>
Date: Mon, 29 Jul 2024 09:11:31 -0400
Subject: [PATCH 5/5] Fixing ci workflow to work with all the provider images

* switching to the bundle CI

Signed-off-by: Shawn Hurley <shawn@hurley.page>
---
 .github/workflows/demo-testing.yml | 43 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/demo-testing.yml b/.github/workflows/demo-testing.yml
index d055e827..01c0e7d4 100644
--- a/.github/workflows/demo-testing.yml
+++ b/.github/workflows/demo-testing.yml
@@ -2,11 +2,6 @@ name: Demo Testing
 
 on: ["push", "pull_request"]
 
-env:
-  IMG_JAVA_PROVIDER: ttl.sh/konveyor-java-external-provider:2hr
-  IMG_DOTNET_PROVIDER: ttl.sh/konveyor-dotnet-external-provider:2h
-  IMG_GENERIC_PROVIDER: ttl.sh/konveyor-generic-external-provider:2h
-
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -18,6 +13,10 @@ jobs:
         env:
           PULL_REQUEST_BODY: ${{ github.event.pull_request.body }}
         run: |
+          echo "IMG_JAVA_PROVIDER=ttl.sh/konveyor-java-external-provider-${GITHUB_SHA}:2h" >>$GITHUB_OUTPUT
+          echo "IMG_DOTNET_PROVIDER=ttl.sh/konveyor-dotnet-external-provider-${GITHUB_SHA}:2h" >>$GITHUB_OUTPUT
+          echo "IMG_GENERIC_PROVIDER=ttl.sh/konveyor-generic-external-provider-${GITHUB_SHA}:2h" >>$GITHUB_OUTPUT
+
           echo "BUILD_BUNDLE=false" >> $GITHUB_OUTPUT
           # if this is a PR, we should use the base branch
           # else, use the branch on which this is running
@@ -68,9 +67,9 @@ jobs:
       - name: build images
         run: |
           make \
-            IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
-            IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
-            IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
+            IMG_JAVA_PROVIDER=${{steps.extract-info.outputs.IMG_JAVA_PROVIDER }}\
+            IMG_DOTNET_PROVIDER=${{steps.extract-info.outputs.IMG_DOTNET_PROVIDER  }}\
+            IMG_GENERIC_PROVIDER=${{steps.extract-info.outputs.IMG_GENERIC_PROVIDER }}\
             build-external
           podman build -t quay.io/konveyor/analyzer-lsp:latest -f Dockerfile .
 
@@ -78,9 +77,9 @@ jobs:
       - name: run demo image
         run : |
           make \
-            IMG_JAVA_PROVIDER=$IMG_JAVA_PROVIDER \
-            IMG_DOTNET_PROVIDER=$IMG_DOTNET_PROVIDER \
-            IMG_GENERIC_PROVIDER=$IMG_GENERIC_PROVIDER \
+            IMG_JAVA_PROVIDER=${{steps.extract-info.outputs.IMG_JAVA_PROVIDER }}\
+            IMG_DOTNET_PROVIDER=${{steps.extract-info.outputs.IMG_DOTNET_PROVIDER  }}\
+            IMG_GENERIC_PROVIDER=${{steps.extract-info.outputs.IMG_GENERIC_PROVIDER }}\
             run-external-providers-pod
           podman build -f demo-local.Dockerfile -t localhost/testing:latest
           make run-demo-image
@@ -107,25 +106,25 @@ jobs:
       - name: Build addon and push images
         working-directory: tackle2-addon-analyzer
         run: |
-          IMG=ttl.sh/konveyor-tackle2-addon-analyzer:2h make image-podman
-          podman push ttl.sh/konveyor-tackle2-addon-analyzer:2h
-          podman push $IMG_JAVA_PROVIDER
-          podman push $IMG_DOTNET_PROVIDER
-          podman push $IMG_GENERIC_PROVIDER
+          IMG=ttl.sh/konveyor-tackle2-addon-analyzer-${GITHUB_SHA}:2h make image-podman
+          podman push ttl.sh/konveyor-tackle2-addon-analyzer-${GITHUB_SHA}:2h
+          podman push ${{steps.extract-info.outputs.IMG_JAVA_PROVIDER }}
+          podman push ${{steps.extract-info.outputs.IMG_DOTNET_PROVIDER  }}
+          podman push ${{steps.extract-info.outputs.IMG_GENERIC_PROVIDER }}
       
       - name: Make bundle image
         uses: konveyor/operator/.github/actions/make-bundle@main
         with:
-          operator_bundle: ttl.sh/konveyor-operator-bundle-shawn-test:2h
-          addon_analyzer: ttl.sh/konveyor-tackle2-addon-analyzer:2h
-          provider_generic: ${{ env.IMG_GENERIC_PROVIDER }}
-          provider_java: ${{ env.IMG_JAVA_PROVIDER}}
+          operator_bundle: ttl.sh/konveyor-operator-bundle-${{ github.sha}}:2h
+          addon_analyzer: ttl.sh/konveyor-tackle2-addon-analyzer-${{ github.sha}}:2h
+          provider_generic: ${{steps.extract-info.outputs.IMG_GENERIC_PROVIDER }}
+          provider_java: ${{steps.extract-info.outputs.IMG_JAVA_PROVIDER }}
       - name: push bundle image 
         run: |
-          podman push ttl.sh/konveyor-operator-bundle-shawn-test:2h
+          docker push ttl.sh/konveyor-operator-bundle-${GITHUB_SHA}:2h
   e2e:
     needs: test
     uses: konveyor/ci/.github/workflows/global-ci-bundle.yml@main
     with:
-      operator_bundle: ttl.sh/konveyor-operator-bundle-shawn-test:2h
+      operator_bundle: ttl.sh/konveyor-operator-bundle-${{ github.sha }}:2h
       api_tests_ref: "${{ needs.test.outputs.api_tests_ref }}"