Merge pull request crossplane-contrib#2232 from anagarlau/fix/rds-port

fix(rds): add port to status and connection details from either spec or aws default

Author: ggkhrmv

.golangci.yml

@@ -1,7 +1,7 @@
 run:
   timeout: 30m
 
-  skip-files:
+  exclude-files:
   - "zz_generated\\..+\\.go$"
 
 output:
@@ -21,11 +21,14 @@ linters-settings:
     # [deprecated] comma-separated list of pairs of the form pkg:regex
     # the regex is used to ignore names within pkg. (default "fmt:.*").
     # see https://github.com/kisielk/errcheck#the-deprecated-method for details
-    ignore: fmt:.*,io/ioutil:^Read.*
+    #ignore: fmt:.*,io/ioutil:^Read.*
+    exclude-functions:
+    - fmt.*
+    - io/ioutil:^Read.*
 
   govet:
     # report about shadowed variables
-    check-shadowing: false
+    shadow: false
 
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
@@ -112,7 +115,6 @@ linters-settings:
 
 linters:
   enable:
-    - megacheck
     - govet
     - gocyclo
     - gocritic
@@ -125,15 +127,14 @@ linters:
     - misspell
     - nakedret
     - nolintlint
+    - gosimple
+    - staticcheck
+    - unused
 
   disable:
     # These linters are all deprecated as of golangci-lint v1.49.0. We disable
     # them explicitly to avoid the linter logging deprecation warnings.
-    - deadcode
-    - varcheck
-    - scopelint
-    - structcheck
-    - interfacer
+    - megacheck
 
   presets:
     - bugs

apis/rds/generator-config.yaml

@@ -34,6 +34,11 @@ resources:
         from:
           operation: DescribeDBClusters
           path: DBClusters.KmsKeyId
+      Port:
+        is_read_only: true
+        from:
+          operation: DescribeDBClusters
+          path: DBClusters.Port    
   DBInstanceRoleAssociation:
     exceptions:
       errors:

apis/rds/v1alpha1/zz_db_cluster.go

@@ -1885,6 +1885,10 @@ spec:
 
                       This setting is only for non-Aurora Multi-AZ DB clusters.
                     type: boolean
+                  port:
+                    description: The port that the database engine is listening on.
+                    format: int64
+                    type: integer
                   readReplicaIdentifiers:
                     description: |-
                       Contains one or more identifiers of the read replicas associated with this

apis/rds/v1alpha1/zz_generated.deepcopy.go

@@ -108,6 +108,7 @@ func (e *custom) postObserve(ctx context.Context, cr *svcapitypes.DBCluster, res
 	}
 
 	cr.Status.AtProvider.KMSKeyID = resp.DBClusters[0].KmsKeyId
+	cr.Status.AtProvider.Port = resp.DBClusters[0].Port
 
 	switch pointer.StringValue(resp.DBClusters[0].Status) {
 	case "available", "storage-optimization", "backing-up":
@@ -125,14 +126,10 @@ func (e *custom) postObserve(ctx context.Context, cr *svcapitypes.DBCluster, res
 	obs.ConnectionDetails = managed.ConnectionDetails{
 		xpv1.ResourceCredentialsSecretEndpointKey: []byte(pointer.StringValue(cr.Status.AtProvider.Endpoint)),
 		xpv1.ResourceCredentialsSecretUserKey:     []byte(pointer.StringValue(cr.Spec.ForProvider.MasterUsername)),
-		xpv1.ResourceCredentialsSecretPortKey:     []byte(strconv.FormatInt(pointer.Int64Value(cr.Spec.ForProvider.Port), 10)),
+		xpv1.ResourceCredentialsSecretPortKey:     []byte(strconv.FormatInt(pointer.Int64Value(cr.Status.AtProvider.Port), 10)),
 		"readerEndpoint":                          []byte(pointer.StringValue(cr.Status.AtProvider.ReaderEndpoint)),
 	}
 
-	if pointer.Int64Value(cr.Spec.ForProvider.Port) > 0 {
-		obs.ConnectionDetails[xpv1.ResourceCredentialsSecretPortKey] = []byte(strconv.FormatInt(pointer.Int64Value(cr.Spec.ForProvider.Port), 10))
-	}
-
 	pw, err := dbinstance.GetDesiredPassword(ctx, e.kube, cr)
 	if err != nil {
 		return obs, errors.Wrap(err, dbinstance.ErrGetCachedPassword)