actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-24 16:41:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge pull request #58 from fluxcd/ux/reformat-msg

Browse source
This commit is contained in:
Hidde Beydals 2020-06-23 13:03:44 +02:00 committed by GitHub
commit 3ea7f31797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/tk/check.go
View file

@ -122,35 +122,35 @@ func kubectlCheck(ctx context.Context, version string) bool {
func kubernetesCheck(version string) bool { func kubernetesCheck(version string) bool {
cfg, err := clientcmd.BuildConfigFromFlags("", kubeconfig) cfg, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
if err != nil { if err != nil {
logFailure("kubernetes client initialization failed: %s", err.Error()) logFailure("Kubernetes client initialization failed: %s", err.Error())
return false return false
} }
client, err := kubernetes.NewForConfig(cfg) client, err := kubernetes.NewForConfig(cfg)
if err != nil { if err != nil {
logFailure("kubernetes client initialization failed: %s", err.Error()) logFailure("Kubernetes client initialization failed: %s", err.Error())
return false return false
} }
ver, err := client.Discovery().ServerVersion() ver, err := client.Discovery().ServerVersion()
if err != nil { if err != nil {
logFailure("kubernetes API call failed %s", err.Error()) logFailure("Kubernetes API call failed: %s", err.Error())
return false return false
} }
v, err := semver.ParseTolerant(ver.String()) v, err := semver.ParseTolerant(ver.String())
if err != nil { if err != nil {
logFailure("kubernetes version can't be determined") logFailure("Kubernetes version can't be determined")
return false return false
} }
rng, _ := semver.ParseRange(version) rng, _ := semver.ParseRange(version)
if !rng(v) { if !rng(v) {
logFailure("kubernetes version must be %s", version) logFailure("Kubernetes version must be %s", version)
return false return false
} }
logSuccess("kubernetes %s %s", v.String(), version) logSuccess("Kubernetes %s %s", v.String(), version)
return true return true
} }

10
cmd/tk/create_source_git.go
View file

@ -258,7 +258,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
} }
if gitRepository.Status.Artifact != nil { if gitRepository.Status.Artifact != nil {
logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision) logSuccess("fetched revision: %s", gitRepository.Status.Artifact.Revision)
} else { } else {
return fmt.Errorf("git sync failed, artifact not found") return fmt.Errorf("git sync failed, artifact not found")
} }
@ -268,7 +268,7 @@ func createSourceGitCmdRun(cmd *cobra.Command, args []string) error {
func generateKeyPair(ctx context.Context) (*ssh.KeyPair, error) { func generateKeyPair(ctx context.Context) (*ssh.KeyPair, error) {
var keyGen ssh.KeyPairGenerator var keyGen ssh.KeyPairGenerator
switch sourceGitKeyAlgorithm.String() { switch algorithm := sourceGitKeyAlgorithm.String(); algorithm {
case "rsa": case "rsa":
keyGen = ssh.NewRSAGenerator(int(sourceGitRSABits)) keyGen = ssh.NewRSAGenerator(int(sourceGitRSABits))
case "ecdsa": case "ecdsa":
@ -276,11 +276,11 @@ func generateKeyPair(ctx context.Context) (*ssh.KeyPair, error) {
case "ed25519": case "ed25519":
keyGen = ssh.NewEd25519Generator() keyGen = ssh.NewEd25519Generator()
default: default:
return nil, fmt.Errorf("unsupported public key algorithm '%s'", sourceGitKeyAlgorithm.String()) return nil, fmt.Errorf("unsupported public key algorithm: %s", algorithm)
} }
pair, err := keyGen.Generate() pair, err := keyGen.Generate()
if err != nil { if err != nil {
return nil, fmt.Errorf("key pair generation failed: %w", err) return nil, fmt.Errorf("key pair generation failed, error: %w", err)
} }
return pair, nil return pair, nil
} }
@ -292,7 +292,7 @@ func scanHostKey(ctx context.Context, url *url.URL) ([]byte, error) {
} }
hostKey, err := ssh.ScanHostKey(host, 30*time.Second) hostKey, err := ssh.ScanHostKey(host, 30*time.Second)
if err != nil { if err != nil {
return nil, fmt.Errorf("SSH key scan for host '%s' failed: %w", host, err) return nil, fmt.Errorf("SSH key scan for host %s failed, error: %w", host, err)
} }
return hostKey, nil return hostKey, nil
} }

6
cmd/tk/export_source_git.go
View file

@ -125,16 +125,16 @@ func exportGit(source sourcev1.GitRepository) error {
return nil return nil
} }
func exportGitCredentials(ctx context.Context, kubeClinet client.Client, source sourcev1.GitRepository) error { func exportGitCredentials(ctx context.Context, kubeClient client.Client, source sourcev1.GitRepository) error {
if source.Spec.SecretRef != nil { if source.Spec.SecretRef != nil {
namespacedName := types.NamespacedName{ namespacedName := types.NamespacedName{
Namespace: source.Namespace, Namespace: source.Namespace,
Name: source.Spec.SecretRef.Name, Name: source.Spec.SecretRef.Name,
} }
var cred corev1.Secret var cred corev1.Secret
err := kubeClinet.Get(ctx, namespacedName, &cred) err := kubeClient.Get(ctx, namespacedName, &cred)
if err != nil { if err != nil {
return fmt.Errorf("get secret failed: %w", err) return fmt.Errorf("failed to retrieve secret %s, error: %w", namespacedName.Name, err)
} }
exported := corev1.Secret{ exported := corev1.Secret{

2
cmd/tk/get_source_git.go
View file

@ -62,7 +62,7 @@ func getSourceGitCmdRun(cmd *cobra.Command, args []string) error {
for _, condition := range source.Status.Conditions { for _, condition := range source.Status.Conditions {
if condition.Type == sourcev1.ReadyCondition { if condition.Type == sourcev1.ReadyCondition {
if condition.Status != corev1.ConditionFalse { if condition.Status != corev1.ConditionFalse {
logSuccess("%s last fetched revision %s", source.GetName(), source.Status.Artifact.Revision) logSuccess("%s last fetched revision: %s", source.GetName(), source.Status.Artifact.Revision)
} else { } else {
logFailure("%s %s", source.GetName(), condition.Message) logFailure("%s %s", source.GetName(), condition.Message)
} }

2
cmd/tk/sync_source_git.go
View file

@ -93,7 +93,7 @@ func syncSourceGitCmdRun(cmd *cobra.Command, args []string) error {
} }
if gitRepository.Status.Artifact != nil { if gitRepository.Status.Artifact != nil {
logSuccess("fetched revision %s", gitRepository.Status.Artifact.Revision) logSuccess("fetched revision: %s", gitRepository.Status.Artifact.Revision)
} else { } else {
return fmt.Errorf("git sync failed, artifact not found") return fmt.Errorf("git sync failed, artifact not found")
} }

4
cmd/tk/utils.go
View file

@ -111,7 +111,7 @@ func (*Utils) execTemplate(obj interface{}, tmpl, filename string) error {
func (*Utils) kubeClient(config string) (client.Client, error) { func (*Utils) kubeClient(config string) (client.Client, error) {
cfg, err := clientcmd.BuildConfigFromFlags("", config) cfg, err := clientcmd.BuildConfigFromFlags("", config)
if err != nil { if err != nil {
return nil, fmt.Errorf("kubernetes client initialization failed: %w", err) return nil, fmt.Errorf("Kubernetes client initialization failed: %w", err)
} }
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
@ -123,7 +123,7 @@ func (*Utils) kubeClient(config string) (client.Client, error) {
Scheme: scheme, Scheme: scheme,
}) })
if err != nil { if err != nil {
return nil, fmt.Errorf("kubernetes client initialization failed: %w", err) return nil, fmt.Errorf("Kubernetes client initialization failed: %w", err)
} }
return kubeClient, nil return kubeClient, nil

18
pkg/git/provider_github.go
View file

@ -77,7 +77,7 @@ func (p *GithubProvider) CreateRepository(ctx context.Context, r *Repository) (b
}) })
if err != nil { if err != nil {
if !strings.Contains(err.Error(), "name already exists on this account") { if !strings.Contains(err.Error(), "name already exists on this account") {
return false, fmt.Errorf("create repository error: %w", err) return false, fmt.Errorf("failed to create repository, error: %w", err)
} }
} else { } else {
return true, nil return true, nil
@ -95,13 +95,13 @@ func (p *GithubProvider) AddTeam(ctx context.Context, r *Repository, name, permi
// check team exists // check team exists
_, _, err = gh.Teams.GetTeamBySlug(ctx, r.Owner, name) _, _, err = gh.Teams.GetTeamBySlug(ctx, r.Owner, name)
if err != nil { if err != nil {
return false, fmt.Errorf("get team %s error: %w", name, err) return false, fmt.Errorf("failed to retrieve team '%s', error: %w", name, err)
} }
// check if team is assigned to the repo // check if team is assigned to the repo
_, resp, err := gh.Teams.IsTeamRepoBySlug(ctx, r.Owner, name, r.Owner, r.Name) _, resp, err := gh.Teams.IsTeamRepoBySlug(ctx, r.Owner, name, r.Owner, r.Name)
if resp == nil && err != nil { if resp == nil && err != nil {
return false, fmt.Errorf("is team %s error: %w", name, err) return false, fmt.Errorf("failed to determine if team '%s' is assigned to the repository, error: %w", name, err)
} }
// add team to the repo // add team to the repo
@ -110,7 +110,7 @@ func (p *GithubProvider) AddTeam(ctx context.Context, r *Repository, name, permi
Permission: permission, Permission: permission,
}) })
if err != nil { if err != nil {
return false, fmt.Errorf("add team %s error: %w", name, err) return false, fmt.Errorf("failed to add team '%s' to the repository, error: %w", name, err)
} }
return true, nil return true, nil
} }
@ -128,10 +128,10 @@ func (p *GithubProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
// list deploy keys // list deploy keys
keys, resp, err := gh.Repositories.ListKeys(ctx, r.Owner, r.Name, nil) keys, resp, err := gh.Repositories.ListKeys(ctx, r.Owner, r.Name, nil)
if err != nil { if err != nil {
return false, fmt.Errorf("list deploy keys error: %w", err) return false, fmt.Errorf("failed to list deploy keys, error: %w", err)
} }
if resp.StatusCode >= 300 { if resp.StatusCode >= 300 {
return false, fmt.Errorf("list deploy keys failed with status code: %s", resp.Status) return false, fmt.Errorf("failed to list deploy keys (status code: %s)", resp.Status)
} }
// check if the key exists // check if the key exists
@ -152,10 +152,10 @@ func (p *GithubProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
if existingKey != nil { if existingKey != nil {
resp, err := gh.Repositories.DeleteKey(ctx, r.Owner, r.Name, *existingKey.ID) resp, err := gh.Repositories.DeleteKey(ctx, r.Owner, r.Name, *existingKey.ID)
if err != nil { if err != nil {
return false, fmt.Errorf("delete deploy key error: %w", err) return false, fmt.Errorf("failed to delete deploy key '%s', error: %w", keyName, err)
} }
if resp.StatusCode >= 300 { if resp.StatusCode >= 300 {
return false, fmt.Errorf("delete deploy key failed with status code: %s", resp.Status) return false, fmt.Errorf("failed to delete deploy key '%s' (status code: %s)", keyName, resp.Status)
} }
} }
@ -168,7 +168,7 @@ func (p *GithubProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
ReadOnly: &isReadOnly, ReadOnly: &isReadOnly,
}) })
if err != nil { if err != nil {
return false, fmt.Errorf("create deploy key error: %w", err) return false, fmt.Errorf("failed to create deploy key '%s', error: %w", keyName, err)
} }
return true, nil return true, nil
} }

14
pkg/git/provider_gitlab.go
View file

@ -59,7 +59,7 @@ func (p *GitLabProvider) CreateRepository(ctx context.Context, r *Repository) (b
if !p.IsPersonal { if !p.IsPersonal {
groups, _, err := gl.Groups.ListGroups(&gitlab.ListGroupsOptions{Search: gitlab.String(r.Owner)}, gitlab.WithContext(ctx)) groups, _, err := gl.Groups.ListGroups(&gitlab.ListGroupsOptions{Search: gitlab.String(r.Owner)}, gitlab.WithContext(ctx))
if err != nil { if err != nil {
return false, fmt.Errorf("list groups error: %w", err) return false, fmt.Errorf("failed to list groups, error: %w", err)
} }
if len(groups) > 0 { if len(groups) > 0 {
@ -74,7 +74,7 @@ func (p *GitLabProvider) CreateRepository(ctx context.Context, r *Repository) (b
projects, _, err := gl.Projects.ListProjects(&gitlab.ListProjectsOptions{Search: gitlab.String(r.Name)}, gitlab.WithContext(ctx)) projects, _, err := gl.Projects.ListProjects(&gitlab.ListProjectsOptions{Search: gitlab.String(r.Name)}, gitlab.WithContext(ctx))
if err != nil { if err != nil {
return false, fmt.Errorf("list projects error: %w", err) return false, fmt.Errorf("failed to list projects, error: %w", err)
} }
if len(projects) == 0 { if len(projects) == 0 {
@ -87,7 +87,7 @@ func (p *GitLabProvider) CreateRepository(ctx context.Context, r *Repository) (b
_, _, err := gl.Projects.CreateProject(p) _, _, err := gl.Projects.CreateProject(p)
if err != nil { if err != nil {
return false, fmt.Errorf("create project error: %w", err) return false, fmt.Errorf("failed to create project, error: %w", err)
} }
return true, nil return true, nil
} }
@ -111,7 +111,7 @@ func (p *GitLabProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
var projId int var projId int
projects, _, err := gl.Projects.ListProjects(&gitlab.ListProjectsOptions{Search: gitlab.String(r.Name)}, gitlab.WithContext(ctx)) projects, _, err := gl.Projects.ListProjects(&gitlab.ListProjectsOptions{Search: gitlab.String(r.Name)}, gitlab.WithContext(ctx))
if err != nil { if err != nil {
return false, fmt.Errorf("list projects error: %w", err) return false, fmt.Errorf("failed to list projects, error: %w", err)
} }
if len(projects) > 0 { if len(projects) > 0 {
projId = projects[0].ID projId = projects[0].ID
@ -122,7 +122,7 @@ func (p *GitLabProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
// check if the key exists // check if the key exists
keys, _, err := gl.DeployKeys.ListProjectDeployKeys(projId, &gitlab.ListProjectDeployKeysOptions{}) keys, _, err := gl.DeployKeys.ListProjectDeployKeys(projId, &gitlab.ListProjectDeployKeysOptions{})
if err != nil { if err != nil {
return false, fmt.Errorf("list keys error: %w", err) return false, fmt.Errorf("failed to list deploy keys, error: %w", err)
} }
shouldCreateKey := true shouldCreateKey := true
@ -142,7 +142,7 @@ func (p *GitLabProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
if existingKey != nil { if existingKey != nil {
_, err := gl.DeployKeys.DeleteDeployKey(projId, existingKey.ID, gitlab.WithContext(ctx)) _, err := gl.DeployKeys.DeleteDeployKey(projId, existingKey.ID, gitlab.WithContext(ctx))
if err != nil { if err != nil {
return false, fmt.Errorf("delete key error: %w", err) return false, fmt.Errorf("failed to delete deploy key '%s', error: %w", keyName, err)
} }
} }
@ -154,7 +154,7 @@ func (p *GitLabProvider) AddDeployKey(ctx context.Context, r *Repository, key, k
CanPush: gitlab.Bool(false), CanPush: gitlab.Bool(false),
}, gitlab.WithContext(ctx)) }, gitlab.WithContext(ctx))
if err != nil { if err != nil {
return false, fmt.Errorf("add key error: %w", err) return false, fmt.Errorf("failed to create deploy key '%s', error: %w", keyName, err)
} }
return true, nil return true, nil
} }