Small changes in tests for localauthority server commands (#5426)

Signed-off-by: Agustín Martínez Fayó <[email protected]>
spiffe · Aug 25, 2024 · 755ace1 · 755ace1
1 parent 6e3b32c
commit 755ace1
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/cmd/spire-server/cli/localauthority/jwt/jwt_activate.go b/cmd/spire-server/cli/localauthority/jwt/jwt_activate.go
@@ -77,12 +77,12 @@ func prettyPrintJWTActivate(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Activated JWT authority:")
- if r.ActivatedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.ActivatedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.ActivatedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.ActivatedAuthority == nil {
  return errors.New("internal error: expected to have activated JWT authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.ActivatedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.ActivatedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
diff --git a/cmd/spire-server/cli/localauthority/jwt/jwt_prepare.go b/cmd/spire-server/cli/localauthority/jwt/jwt_prepare.go
@@ -61,12 +61,12 @@ func prettyPrintJWTPrepare(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Prepared JWT authority:")
- if r.PreparedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.PreparedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.PreparedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.PreparedAuthority == nil {
  return errors.New("internal error: expected to have prepared JWT authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.PreparedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.PreparedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
diff --git a/cmd/spire-server/cli/localauthority/jwt/jwt_revoke.go b/cmd/spire-server/cli/localauthority/jwt/jwt_revoke.go
@@ -77,12 +77,12 @@ func prettyPrintJWTRevoke(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Revoked JWT authority:")
- if r.RevokedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.RevokedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.RevokedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.RevokedAuthority == nil {
  return errors.New("internal error: expected to have revoked JWT authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.RevokedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.RevokedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
diff --git a/cmd/spire-server/cli/localauthority/jwt/jwt_taint.go b/cmd/spire-server/cli/localauthority/jwt/jwt_taint.go
@@ -73,13 +73,13 @@ func prettyPrintJWTTaint(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Tainted JWT authority:")
- if r.TaintedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.TaintedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.TaintedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.TaintedAuthority == nil {
  return errors.New("internal error: expected to have tainted JWT authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.TaintedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.TaintedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
 

diff --git a/cmd/spire-server/cli/localauthority/x509/x509_activate.go b/cmd/spire-server/cli/localauthority/x509/x509_activate.go
@@ -77,12 +77,12 @@ func prettyPrintX509Activate(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Activated X.509 authority:")
- if r.ActivatedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.ActivatedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.ActivatedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.ActivatedAuthority == nil {
  return errors.New("internal error: expected to have activated X.509 authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.ActivatedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.ActivatedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
diff --git a/cmd/spire-server/cli/localauthority/x509/x509_prepare.go b/cmd/spire-server/cli/localauthority/x509/x509_prepare.go
@@ -61,12 +61,12 @@ func prettyPrintX509Prepare(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Prepared X.509 authority:")
- if r.PreparedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.PreparedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.PreparedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.PreparedAuthority == nil {
  return errors.New("internal error: expected to have prepared X.509 authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.PreparedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.PreparedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
diff --git a/cmd/spire-server/cli/localauthority/x509/x509_revoke.go b/cmd/spire-server/cli/localauthority/x509/x509_revoke.go
@@ -77,12 +77,12 @@ func prettyPrintX509Revoke(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Revoked X.509 authority:")
- if r.RevokedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.RevokedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.RevokedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.RevokedAuthority == nil {
  return errors.New("internal error: expected to have revoked X.509 authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.RevokedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.RevokedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }
diff --git a/cmd/spire-server/cli/localauthority/x509/x509_taint.go b/cmd/spire-server/cli/localauthority/x509/x509_taint.go
@@ -73,13 +73,13 @@ func prettyPrintX509Taint(env *commoncli.Env, results ...any) error {
  }
 
  env.Println("Tainted X.509 authority:")
- if r.TaintedAuthority != nil {
- env.Printf(" Authority ID: %s\n", r.TaintedAuthority.AuthorityId)
- env.Printf(" Expires at: %s\n", time.Unix(r.TaintedAuthority.ExpiresAt, 0).UTC())
- } else {
+ if r.TaintedAuthority == nil {
  return errors.New("internal error: expected to have tainted X.509 authority information")
  }
 
+ env.Printf(" Authority ID: %s\n", r.TaintedAuthority.AuthorityId)
+ env.Printf(" Expires at: %s\n", time.Unix(r.TaintedAuthority.ExpiresAt, 0).UTC())
+
  return nil
 }