[Misc] Quality: minor issues addressed (#377)

misc Q fixes.

Author: Pavan-SAP

cmd/server/internal/handler.go

@@ -510,7 +510,6 @@ func (s *SubscriptionHandler) DeleteTenant(reqInfo *RequestInfo) *Result {
 }
 
 func (s *SubscriptionHandler) authorizationCheck(headerDetails *requestHeaderDetails, ca *v1alpha1.CAPApplication, subscription subscriptionType, step string) (saasData *util.SaasRegistryCredentials, smsData *util.SmsCredentials, err error) {
-	uaaData := &util.XSUAACredentials{}
 	switch subscription {
 	case SMS:
 		// fetch SMS information
@@ -523,6 +522,7 @@ func (s *SubscriptionHandler) authorizationCheck(headerDetails *requestHeaderDet
 		err = s.checkCertIssuerAndSubject(headerDetails.xForwardedClientCert, smsData, step)
 
 	default:
+		uaaData := &util.XSUAACredentials{}
 		// fetch SaaS Registry and XSUAA information
 		saasData, uaaData = s.getServiceDetails(ca, step)
 		if saasData == nil || uaaData == nil {

internal/controller/reconcile-captenant.go

@@ -580,7 +580,7 @@ func (c *Controller) getCAPApplicationVersionForTenantOperationType(ctx context.
 	case v1alpha1.CAPTenantOperationTypeDeprovisioning: // for deletion - use the current CAPApplicationVersion (from status)
 		if cat.Status.CurrentCAPApplicationVersionInstance == "" {
 			err := fmt.Errorf("cannot identify %s for %s %s.%s", v1alpha1.CAPApplicationVersionKind, v1alpha1.CAPTenantKind, cat.Namespace, cat.Name)
-			util.LogError(err, "Cannot identify applicaion version", string(Deprovisioning), cat, nil, "tenantId", cat.Spec.TenantId)
+			util.LogError(err, "Cannot identify application version", string(Deprovisioning), cat, nil, "tenantId", cat.Spec.TenantId)
 			return nil, err
 		}
 		cav, err := c.crdClient.SmeV1alpha1().CAPApplicationVersions(cat.Namespace).Get(ctx, cat.Status.CurrentCAPApplicationVersionInstance, metav1.GetOptions{})

pkg/apis/sme.sap.com/v1alpha1/types.go

@@ -24,7 +24,7 @@ const (
 	CAPTenantOperationKind        = "CAPTenantOperation"
 	CAPTenantOperationResource    = "captenantoperations"
 	CAPTenantOutputKind           = "CAPTenantOutput"
-	CAPTenantOutputResource       = "captenantouputs"
+	CAPTenantOutputResource       = "captenantoutputs"
 	DomainKind                    = "Domain"
 	DomainResource                = "domains"
 	ClusterDomainKind             = "ClusterDomain"
@@ -92,7 +92,7 @@ type CAPApplicationSpec struct {
 	DomainRefs []DomainRef `json:"domainRefs,omitempty"`
 	// [DEPRECATED] Domains used by the application // Will be removed in future versions
 	Domains ApplicationDomains `json:"domains,omitempty"`
-	// SAP BTP Global Account Identifier where services are entitles for the current application
+	// SAP BTP Global Account Identifier where services are entitled for the current application
 	// Will soon be deprecated, use ProviderSubaccountId instead
 	GlobalAccountId string `json:"globalAccountId"`
 	// The subaccount ID in which the application is provided (will soon replace GlobalAccountId)
@@ -393,11 +393,11 @@ type DeletionRules struct {
 //
 // Rule evaluation for Gauge type metric: The time series data of the metric (restricted to the current workload by setting `job` label as workload service name) is calculated as an average over the specified period.
 // A sum of the calculated average from different time series is then compared to the provided threshold value to determine whether the rule has been satisfied.
-// Evaluation: `sum(avg_over_time(<gauge-metric>{job=<workload-service-name>}[<lookback-duration>])) <= <lower0threshold-value>`
+// Evaluation: `sum(avg_over_time(<gauge-metric>{job=<workload-service-name>}[<lookback-duration>])) <= <lower-threshold-value>`
 //
 // Rule evaluation for Counter type metric: The time series data of the metric (restricted to the current workload by setting `job` label as workload service name) is calculated as rate of increase over the specified period.
 // The sum of the calculated rates from different time series is then compared to the provided threshold value to determine whether the rule has been satisfied.
-// Evaluation: `sum(rate(<counter-metric>{job=<workload-service-name>}[<lookback-duration>])) <= <lower0threshold-value>`
+// Evaluation: `sum(rate(<counter-metric>{job=<workload-service-name>}[<lookback-duration>])) <= <lower-threshold-value>`
 type MetricRule struct {
 	// Prometheus metric. For example `http_request_count`
 	Name string `json:"name"`
@@ -450,7 +450,7 @@ type JobDetails struct {
 	BackoffLimit *int32 `json:"backoffLimit,omitempty"`
 	// Specifies the time after which the job may be cleaned up.
 	TTLSecondsAfterFinished *int32 `json:"ttlSecondsAfterFinished,omitempty"`
-	// Specifies the duration in sections for which the job may be continuously active.
+	// Specifies the duration in seconds for which the job may be continuously active.
 	ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"`
 }
 
@@ -798,7 +798,7 @@ type DomainSpec struct {
 type DNSTemplate struct {
 	// Domain name for which a DNS record will be created
 	Name string `json:"name"`
-	// Target of the DNS reord
+	// Target of the DNS record
 	Target string `json:"target"`
 }
 

pkg/client/applyconfiguration/sme.sap.com/v1alpha1/capapplicationspec.go

@@ -113,7 +113,7 @@ <h3 id="sme.sap.com/v1alpha1.CAPApplication">CAPApplication
 </em>
 </td>
 <td>
-<p>SAP BTP Global Account Identifier where services are entitles for the current application
+<p>SAP BTP Global Account Identifier where services are entitled for the current application
 Will soon be deprecated, use ProviderSubaccountId instead</p>
 </td>
 </tr>
@@ -1179,7 +1179,7 @@ <h3 id="sme.sap.com/v1alpha1.CAPApplicationSpec">CAPApplicationSpec
 </em>
 </td>
 <td>
-<p>SAP BTP Global Account Identifier where services are entitles for the current application
+<p>SAP BTP Global Account Identifier where services are entitled for the current application
 Will soon be deprecated, use ProviderSubaccountId instead</p>
 </td>
 </tr>
@@ -2349,7 +2349,7 @@ <h3 id="sme.sap.com/v1alpha1.DNSTemplate">DNSTemplate
 </em>
 </td>
 <td>
-<p>Target of the DNS reord</p>
+<p>Target of the DNS record</p>
 </td>
 </tr>
 </tbody>
@@ -3081,7 +3081,7 @@ <h3 id="sme.sap.com/v1alpha1.JobDetails">JobDetails
 </em>
 </td>
 <td>
-<p>Specifies the duration in sections for which the job may be continuously active.</p>
+<p>Specifies the duration in seconds for which the job may be continuously active.</p>
 </td>
 </tr>
 </tbody>
@@ -3121,10 +3121,10 @@ <h3 id="sme.sap.com/v1alpha1.MetricRule">MetricRule
 <p>MetricRule specifies a Prometheus metric and rule which represents a cleanup condition. Metrics of type Gauge and Counter are supported.</p>
 <p>Rule evaluation for Gauge type metric: The time series data of the metric (restricted to the current workload by setting <code>job</code> label as workload service name) is calculated as an average over the specified period.
 A sum of the calculated average from different time series is then compared to the provided threshold value to determine whether the rule has been satisfied.
-Evaluation: <code>sum(avg_over_time(&lt;gauge-metric&gt;{job=&lt;workload-service-name&gt;}[&lt;lookback-duration&gt;])) &lt;= &lt;lower0threshold-value&gt;</code></p>
+Evaluation: <code>sum(avg_over_time(&lt;gauge-metric&gt;{job=&lt;workload-service-name&gt;}[&lt;lookback-duration&gt;])) &lt;= &lt;lower-threshold-value&gt;</code></p>
 <p>Rule evaluation for Counter type metric: The time series data of the metric (restricted to the current workload by setting <code>job</code> label as workload service name) is calculated as rate of increase over the specified period.
 The sum of the calculated rates from different time series is then compared to the provided threshold value to determine whether the rule has been satisfied.
-Evaluation: <code>sum(rate(&lt;counter-metric&gt;{job=&lt;workload-service-name&gt;}[&lt;lookback-duration&gt;])) &lt;= &lt;lower0threshold-value&gt;</code></p>
+Evaluation: <code>sum(rate(&lt;counter-metric&gt;{job=&lt;workload-service-name&gt;}[&lt;lookback-duration&gt;])) &lt;= &lt;lower-threshold-value&gt;</code></p>
 </div>
 <table>
 <thead>
@@ -3942,5 +3942,5 @@ <h3 id="sme.sap.com/v1alpha1.WorkloadMonitoring">WorkloadMonitoring
 <hr/>
 <p><em>
 Generated with <code>gen-crd-api-reference-docs</code>
-on git commit <code>537363a</code>.
+on git commit <code>ab07890</code>.
 </em></p>