diff --git a/cmd/kosli/root.go b/cmd/kosli/root.go index 57449d950..d4cee5eab 100644 --- a/cmd/kosli/root.go +++ b/cmd/kosli/root.go @@ -129,6 +129,7 @@ The service principal needs to have the following permissions: azureTenantIdFlag = "Azure tenant ID." azureSubscriptionIdFlag = "Azure subscription ID." azureResourceGroupNameFlag = "Azure resource group name." + azureDigestsSourceFlag = "[defaulted] Where to get the digests from. Valid values are 'acr' and 'logs'. Defaults to 'acr'" githubTokenFlag = "Github token." githubOrgFlag = "Github organization. (defaulted if you are running in GitHub Actions: https://docs.kosli.com/ci-defaults )." githubBaseURLFlag = "[optional] GitHub base URL (only needed for GitHub Enterprise installations)." diff --git a/cmd/kosli/snapshotAzureApps.go b/cmd/kosli/snapshotAzureApps.go index f27d036fb..23517bc9d 100644 --- a/cmd/kosli/snapshotAzureApps.go +++ b/cmd/kosli/snapshotAzureApps.go @@ -76,7 +76,7 @@ func newSnapshotAzureAppsCmd(out io.Writer) *cobra.Command { cmd.Flags().StringVar(&o.azureStaticCredentials.SubscriptionId, "azure-subscription-id", "", azureSubscriptionIdFlag) cmd.Flags().StringVar(&o.azureStaticCredentials.ResourceGroupName, "azure-resource-group-name", "", azureResourceGroupNameFlag) cmd.Flags().BoolVar(&o.azureStaticCredentials.DownloadLogsAsZip, "zip", false, "Download logs from Azure as zip files") - cmd.Flags().StringVar(&o.azureStaticCredentials.DigestsSource, "digests-source", "acr", "[defaulted] Where to get the digests from. Valid values are 'acr' and 'logs'. Defaults to 'acr'") + cmd.Flags().StringVar(&o.azureStaticCredentials.DigestsSource, "digests-source", "acr", azureDigestsSourceFlag) addDryRunFlag(cmd) err := RequireFlags(cmd, []string{ diff --git a/cmd/kosli/snapshotAzureApps_test.go b/cmd/kosli/snapshotAzureApps_test.go index d6f8c5964..feb788218 100644 --- a/cmd/kosli/snapshotAzureApps_test.go +++ b/cmd/kosli/snapshotAzureApps_test.go @@ -56,15 +56,15 @@ func (suite *SnapshotAzureAppsTestSuite) TestSnapshotAzureAppsCmd() { }, { name: "snapshot azure succeeds if all required flags are set", - cmd: fmt.Sprintf(`snapshot azure %s %s %s --dry-run`, suite.envName, suite.defaultKosliArguments, suite.defaultAzureArguments), + cmd: fmt.Sprintf(`snapshot azure %s %s %s`, suite.envName, suite.defaultKosliArguments, suite.defaultAzureArguments), }, { name: "snapshot azure succeeds when digests-source is set to acr if all required flags are set", - cmd: fmt.Sprintf(`snapshot azure %s %s %s --digests-source acr --dry-run`, suite.envName, suite.defaultKosliArguments, suite.defaultAzureArguments), + cmd: fmt.Sprintf(`snapshot azure %s %s %s --digests-source acr`, suite.envName, suite.defaultKosliArguments, suite.defaultAzureArguments), }, { name: "snapshot azure succeeds when digests-source is set to logs if all required flags are set", - cmd: fmt.Sprintf(`snapshot azure %s %s %s --digests-source logs --dry-run`, suite.envName, suite.defaultKosliArguments, suite.defaultAzureArguments), + cmd: fmt.Sprintf(`snapshot azure %s %s %s --digests-source logs`, suite.envName, suite.defaultKosliArguments, suite.defaultAzureArguments), }, { diff --git a/internal/azure/azure_apps.go b/internal/azure/azure_apps.go index f354f31b1..13a384844 100644 --- a/internal/azure/azure_apps.go +++ b/internal/azure/azure_apps.go @@ -35,9 +35,9 @@ type AzureClient struct { // AppData represents the harvested Azure service app and function app data type AppData struct { - AppName string `json:"appName"` - AppKind string `json:"appKind"` - DigestsSource string `json:"digestsSource"` + AppName string `json:"app_name"` + AppKind string `json:"app_kind"` + DigestsSource string `json:"digests_source"` Digests map[string]string `json:"digests"` StartedAt int64 `json:"creationTimestamp"` }