Fix error of dataservices: mongodb, logme2, search, prometheus #50
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abdulhaseeb3
requested changes
May 9, 2025
provider-anynines/apis/servicebinding/v1/servicebinding_types.go
Outdated
Show resolved
Hide resolved
provider-anynines/internal/controller/servicebinding/servicebinding.go
Outdated
Show resolved
Hide resolved
provider-anynines/internal/controller/servicebinding/servicebinding.go
Outdated
Show resolved
Hide resolved
provider-anynines/internal/controller/servicebinding/servicebinding.go
Outdated
Show resolved
Hide resolved
provider-anynines/internal/controller/servicebinding/servicebinding.go
Outdated
Show resolved
Hide resolved
abdulhaseeb3
requested changes
May 19, 2025
provider-anynines/apis/servicebinding/v1/servicebinding_types.go
Outdated
Show resolved
Hide resolved
provider-anynines/internal/controller/servicebinding/servicebinding.go
Outdated
Show resolved
Hide resolved
provider-anynines/internal/controller/servicebinding/servicebinding.go
Outdated
Show resolved
Hide resolved
abdulhaseeb3
requested changes
May 26, 2025
| @@ -368,6 +371,16 @@ func getInstanceCredentials(instance osbclient.GetInstanceResponse, sb *v1.Servi | |||
| return nil | |||
| } | |||
|
|
|||
| func (c external) parseHostAndPort(input string) (host, port string, err error) { | |||
There was a problem hiding this comment.
Please add a comment of how this function works, with a expected format string
| @@ -376,14 +389,97 @@ func (c external) initializeConnectionDetails(ctx context.Context, sb *v1.Servic | |||
| return err | |||
| } | |||
|
|
|||
| sb.Status.AtProvider.ConnectionDetails.HostURL = string(secret.Data["host"]) | |||
| sb.Status.AtProvider.ConnectionDetails.Port = string(secret.Data["port"]) | |||
| var hostURL, port string | |||
|
|
||
| if strings.Contains(instanceName, "search") { | ||
| host, found := secret.Data["host"] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { |
There was a problem hiding this comment.
Please add an else condition that the host is not in a recognised format
Comment on lines
406
to
412
| if found && len(host) >= 0 { | ||
| hostURL, port, err = c.parseHostAndPort(string(host)) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sb.AddConnectionDetails(hostURL, port) | ||
| } |
Comment on lines
415
to
421
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | ||
| hostURL, port, err = c.parseHostAndPort(string(host[1 : len(host)-1])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sb.AddConnectionDetails(hostURL, port) | ||
| } |
Comment on lines
424
to
466
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | ||
| parsedURL, err := url.Parse(string(host[1 : len(host)-1])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| hostURL, port, err = c.parseHostAndPort(parsedURL.Scheme + "://" + parsedURL.Host) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sb.AddConnectionDetails(hostURL, port) | ||
| } | ||
| host, found = secret.Data["alertmanager_urls"] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | ||
| parsedURL, err := url.Parse(string(host[1 : len(host)-1])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| hostURL, port, err = c.parseHostAndPort(parsedURL.Scheme + "://" + parsedURL.Host) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sb.AddConnectionDetails(hostURL, port) | ||
| } | ||
| host, found = secret.Data["grafana_urls"] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | ||
| parsedURL, err := url.Parse(string(host[1 : len(host)-1])) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| hostURL, port, err = c.parseHostAndPort(parsedURL.Scheme + "://" + parsedURL.Host) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| sb.AddConnectionDetails(hostURL, port) | ||
| } | ||
| host, found = secret.Data["graphite_exporters"] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | ||
| hostURL = string(string(host[1 : len(host)-1])) | ||
| port, found := secret.Data["graphite_exporter_port"] | ||
| if found { | ||
| sb.AddConnectionDetails(hostURL, string(port)) | ||
| } | ||
| } |
| // Validate status | ||
| if sb.Status.AtProvider.ConnectionDetails.HasMissingFields() { | ||
| if !sb.ConnectionDetailsIsNotEmpty() { |
|
|
||
| if strings.Contains(instanceName, "search") { | ||
| host, found := secret.Data["host"] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { |
There was a problem hiding this comment.
Also these conditions and the code inside these conditions are repeating, maybe create a function to make it easier on the eyes
abdulhaseeb3
requested changes
May 28, 2025
|
|
||
| func (c external) extractBracketHost(sb *v1.ServiceBinding, secret map[string][]byte, key string) error { | ||
| host, found := secret[key] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { |
There was a problem hiding this comment.
Suggested change
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | |
| if found && len(host) > 2 && host[0] == '[' && host[len(host)-1] == ']' { |
|
|
||
| func (c external) extractPlainHost(sb *v1.ServiceBinding, secret map[string][]byte, key string) error { | ||
| host, found := secret[key] | ||
| if found && len(host) >= 0 { |
There was a problem hiding this comment.
Suggested change
| if found && len(host) >= 0 { | |
| if found && len(host) > 0 { |
|
|
||
| func (c external) extractPrometheusHost(sb *v1.ServiceBinding, secret map[string][]byte, key string, port string) error { | ||
| host, found := secret[key] | ||
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { |
There was a problem hiding this comment.
Suggested change
| if found && len(host) >= 2 && host[0] == '[' && host[len(host)-1] == ']' { | |
| if found && len(host) > 2 && host[0] == '[' && host[len(host)-1] == ']' { |
| @@ -376,12 +446,54 @@ func (c external) initializeConnectionDetails(ctx context.Context, sb *v1.Servic | |||
| return err | |||
| } | |||
|
|
|||
| sb.Status.AtProvider.ConnectionDetails.HostURL = string(secret.Data["host"]) | |||
| sb.Status.AtProvider.ConnectionDetails.Port = string(secret.Data["port"]) | |||
| instanceName := sb.ObjectMeta.Labels["klutch.io/instance-name"] | |||
There was a problem hiding this comment.
Suggested change
| instanceName := sb.ObjectMeta.Labels["klutch.io/instance-name"] | |
| instanceType := sb.ObjectMeta.Labels["klutch.io/instance-type"] |
…f servicebindings
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is currently a bug in the provider-anynines which prevents the status of a service binding from being updated correctly for certain dataservices. As a result, the provider continuously attempts to update the status in a loop.
Affected Dataservices: