Support --airgap in unregister command (minio#4441)

cmd/license-unregister.go

@@ -36,7 +36,7 @@ var licenseUnregisterCmd = cli.Command{
  Action: mainLicenseUnregister,
  Before: setGlobalsFromContext,
  Hidden: true,
- Flags: supportGlobalFlags,
+ Flags: append(supportGlobalFlags, subnetCommonFlags...),
  CustomHelpTemplate: `NAME:
  {{.HelpName}} - {{.Usage}}
 
@@ -83,14 +83,19 @@ func mainLicenseUnregister(ctx *cli.Context) error {
  checkLicenseUnregisterSyntax(ctx)
 
  aliasedURL := ctx.Args().Get(0)
- alias, _ := initSubnetConnectivity(ctx, aliasedURL, false)
+ alias, apiKey := initSubnetConnectivity(ctx, aliasedURL, false)
+ if len(apiKey) == 0 {
+ // api key not passed as flag. Check that the cluster is registered.
+ apiKey = validateClusterRegistered(alias, true)
+ }
 
- apiKey, e := getSubnetAPIKey(alias)
- fatalIf(probe.NewError(e), "Error in fetching SUBNET API Key:")
+ if !globalAirgapped {
+ info := getAdminInfo(aliasedURL)
+ e := unregisterClusterFromSubnet(alias, info.DeploymentID, apiKey)
+ fatalIf(probe.NewError(e), "Could not unregister cluster from SUBNET:")
+ }
 
- info := getAdminInfo(aliasedURL)
- e = unregisterClusterFromSubnet(alias, info.DeploymentID, apiKey)
- fatalIf(probe.NewError(e), "Could not unregister cluster from SUBNET:")
+ removeSubnetAuthConfig(alias)
 
  printMsg(licUnregisterMessage{Status: "success", Alias: alias})
  return nil

cmd/subnet-utils.go

@@ -582,13 +582,7 @@ func unregisterClusterFromSubnet(alias string, depID string, apiKey string) erro
  }
 
  _, e = subnetPostReq(regURL, nil, headers)
- if e != nil {
- return e
- }
-
- removeSubnetAuthConfig(alias)
-
- return nil
+ return e
 }
 
 // validateAndSaveLic - validates the given license in minio config