Skip to content

Commit

Permalink
Chore: refactor credentials and cost (#395)
Browse files Browse the repository at this point in the history
* Chore: refactor credentials and cost

* fix unit tests
  • Loading branch information
TomerHeber committed May 29, 2022
1 parent 501fa95 commit cd50828
Show file tree
Hide file tree
Showing 13 changed files with 226 additions and 601 deletions.
20 changes: 19 additions & 1 deletion env0/credentials.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package env0

import (
"errors"
"fmt"
"log"
"strings"
Expand Down Expand Up @@ -35,11 +36,28 @@ func getCredentialsByName(name string, prefix string, meta interface{}) (client.
return foundCredentials[0], nil
}

func getCredentialsById(id string, prefix string, meta interface{}) (client.Credentials, error) {
apiClient := meta.(client.ApiClientInterface)
credentials, err := apiClient.CloudCredentials(id)
if err != nil {
if _, ok := err.(*client.NotFoundError); ok {
return client.Credentials{}, errors.New("credentials not found")
}
return client.Credentials{}, err
}

if !strings.HasPrefix(credentials.Type, prefix) {
return client.Credentials{}, fmt.Errorf("credentials type mistmatch %s", credentials.Type)
}

return credentials, nil
}

func getCredentials(id string, prefix string, meta interface{}) (client.Credentials, error) {
_, err := uuid.Parse(id)
if err == nil {
log.Println("[INFO] Resolving credentials by id: ", id)
return meta.(client.ApiClientInterface).CloudCredentials(id)
return getCredentialsById(id, prefix, meta)
} else {
log.Println("[INFO] Resolving credentials by name: ", id)
return getCredentialsByName(id, prefix, meta)
Expand Down
98 changes: 0 additions & 98 deletions env0/data_aws_credentials.go

This file was deleted.

112 changes: 0 additions & 112 deletions env0/data_aws_credentials_test.go

This file was deleted.

94 changes: 0 additions & 94 deletions env0/data_azure_credentials.go

This file was deleted.

Loading

0 comments on commit cd50828

Please sign in to comment.