certmanager updates

2024-08-14 11:38:01 +02:00
parent 6a3290b9ac
commit f25197e714
13 changed files with 449 additions and 392 deletions
--- a/internal/test/Makefile.in
+++ b/internal/test/Makefile.in
@@ -233,9 +233,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign internal/test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu internal/test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign internal/test/Makefile
+	  $(AUTOMAKE) --gnu internal/test/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
--- a/internal/test/logic_issuer_create_test.go
+++ b/internal/test/logic_issuer_create_test.go
@@ -37,7 +37,6 @@ func TestIssuerCreateN0(t *testing.T) {
 		require.NoError(t, err)

 		logicConfig := &logic.LogicConfig{
-			Auths:    conf.Auths,
 			Database: db,
 		}
 		lg, err = logic.NewLogic(logicConfig)
@@ -51,7 +50,7 @@ func TestIssuerCreateN0(t *testing.T) {

 	var signerID int64
 	var signerCert string
-	var signerName string
+	//var signerName string
 	{
 		createIssuerPairParams := &cmctl.CreateIssuerPairParams{
 			IssuerOrganizationName:       "Detroit cops",
@@ -63,34 +62,33 @@ func TestIssuerCreateN0(t *testing.T) {
 		require.NotNil(t, createIssuerPairRes)

 		signerID = createIssuerPairRes.IssuerID
-		printObj("signerID", signerID)
-
+		//printObj("signerID", signerID)
 		signerCert = createIssuerPairRes.Certificate
 		//printObj("signerCert", signerCert)
-
-		signerName = createIssuerPairRes.IssuerName
-		printObj("signerName", signerName)
+		//signerName = createIssuerPairRes.IssuerName
+		//printObj("signerName", signerName)

 		signerCertObj, err := cm509.ParseDoubleEncodedCerificate(signerCert)
 		require.NoError(t, err)
 		require.NotNil(t, signerCertObj)
-		printObj("signerCertObj Subject", signerCertObj.Subject.String())
-		printObj("signerCertObj Issuer", signerCertObj.Issuer.String())
+		//printObj("signerCertObj Subject", signerCertObj.Subject.String())
+		//printObj("signerCertObj Issuer", signerCertObj.Issuer.String())

 		require.Equal(t, signerCertObj.Subject.String(), signerCertObj.Issuer.String())
 		require.NotZero(t, signerCertObj.Subject.String())
 		require.NotZero(t, signerCertObj.Issuer.String())

-		signerPEM, err := base64.StdEncoding.DecodeString(signerCert)
-		require.NoError(t, err)
-		require.NotZero(t, len(signerPEM))
-		printObj("signerPEM", string(signerPEM))
+		//signerPEM, err := base64.StdEncoding.DecodeString(signerCert)
+		//require.NoError(t, err)
+		//require.NotZero(t, len(signerPEM))
+		//printObj("signerPEM", string(signerPEM))

+		printObj("createIssuerPairRes", createIssuerPairRes)
 	}

 	var issuerID int64
 	var issuerCert string
-	var issuerName string
+	//var issuerName string
 	{
 		createIssuerPairParams := &cmctl.CreateIssuerPairParams{
 			IssuerCommonName:             "Intendant",
@@ -104,32 +102,49 @@ func TestIssuerCreateN0(t *testing.T) {
 		require.NotNil(t, createIssuerPairRes)

 		issuerID = createIssuerPairRes.IssuerID
-		printObj("issuerID", issuerID)
+		//printObj("issuerID", issuerID)

 		issuerCert = createIssuerPairRes.Certificate
 		//printObj("issuerCert", issuerCert)

-		issuerName = createIssuerPairRes.IssuerName
-		printObj("issuerName", issuerName)
+		//issuerName = createIssuerPairRes.IssuerName
+		//printObj("issuerName", issuerName)

 		issuerCertObj, err := cm509.ParseDoubleEncodedCerificate(issuerCert)
 		require.NoError(t, err)
 		require.NotNil(t, issuerCertObj)
-		printObj("issuerCertObj Subject", issuerCertObj.Subject.String())
-		printObj("issuerCertObj Issuer", issuerCertObj.Issuer.String())
+		//printObj("issuerCertObj Subject", issuerCertObj.Subject.String())
+		//printObj("issuerCertObj Issuer", issuerCertObj.Issuer.String())

 		require.NotEqual(t, issuerCertObj.Subject.String(), issuerCertObj.Issuer.String())
 		require.NotZero(t, issuerCertObj.Subject.String())
 		require.NotZero(t, issuerCertObj.Issuer.String())

-		issuerPEM, err := base64.StdEncoding.DecodeString(issuerCert)
-		require.NoError(t, err)
-		require.NotZero(t, len(issuerPEM))
-		printObj("issuerPEM", string(issuerPEM))
+		//issuerPEM, err := base64.StdEncoding.DecodeString(issuerCert)
+		//require.NoError(t, err)
+		//require.NotZero(t, len(issuerPEM))
+		//printObj("issuerPEM", string(issuerPEM))
+
+		printObj("createIssuerPairRes", createIssuerPairRes)
 	}
+	{
+		getIssuerCertificateParams := &cmctl.GetIssuerCertificateParams{
+			IssuerID: issuerID,
+		}
+		getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, userID, getIssuerCertificateParams)
+		require.NoError(t, err)
+		require.NotNil(t, getIssuerCertificateRes)
+		require.NotZero(t, len(getIssuerCertificateRes.Certificate))
+
+		printObj("getIssuerCertificateRes", getIssuerCertificateRes)
+		require.NoError(t, err)
+	}
+
+	//return
+
 	var serviceID int64
 	var serviceCert string
-	var serviceName string
+	//var serviceName string
 	{
 		createServicePairParams := &cmctl.CreateServicePairParams{
 			ServiceCommonName:             "The Robocop",
@@ -137,43 +152,43 @@ func TestIssuerCreateN0(t *testing.T) {
 			ServiceOrganizationalUnitName: "Special Operations",
 			IssuerID:                      issuerID,
 			//InetAddresses:     []string{"1.1.1.1", "1.1.1.2", "1.1.1.3"},
-			//Hostnames:         []string{"dont.worry", "be.happy"},
+			Hostnames: []string{"dont.worry", "be.happy"},
 		}
 		createServicePairRes, err := lg.CreateServicePair(ctx, userID, createServicePairParams)
 		require.NoError(t, err)
 		require.NotNil(t, createServicePairRes)

 		serviceID = createServicePairRes.ServiceID
-		printObj("serviceID", serviceID)
+		//printObj("serviceID", serviceID)

 		serviceCert = createServicePairRes.Certificate
 		//printObj("serviceCert", serviceCert)

-		serviceName = createServicePairRes.ServiceName
-		printObj("serviceName", serviceName)
+		//serviceName = createServicePairRes.ServiceName
+		//printObj("serviceName", serviceName)

 		serviceCertObj, err := cm509.ParseDoubleEncodedCerificate(serviceCert)
 		require.NoError(t, err)
 		require.NotNil(t, serviceCertObj)
-		printObj("serviceCertObj Subject", serviceCertObj.Subject.String())
-		printObj("serviceCertObj Issuer", serviceCertObj.Issuer.String())
-		printObj("serviceCertObj DNSNames", serviceCertObj.DNSNames)
-		printObj("serviceCertObj IP addresses", serviceCertObj.IPAddresses)
+		//printObj("serviceCertObj Subject", serviceCertObj.Subject.String())
+		//printObj("serviceCertObj Issuer", serviceCertObj.Issuer.String())
+		//printObj("serviceCertObj DNSNames", serviceCertObj.DNSNames)
+		//printObj("serviceCertObj IP addresses", serviceCertObj.IPAddresses)

 		require.NotEqual(t, serviceCertObj.Subject.String(), serviceCertObj.Issuer.String())
-		require.NotZero(t, serviceCertObj.Subject.String())
-		require.NotZero(t, serviceCertObj.Issuer.String())
+		require.NotZero(t, len(serviceCertObj.Subject.String()))
+		require.NotZero(t, len(serviceCertObj.Issuer.String()))

 		servicePEM, err := base64.StdEncoding.DecodeString(serviceCert)
 		require.NoError(t, err)
 		require.NotZero(t, len(servicePEM))
-		printObj("servicePEM", string(servicePEM))
+		//printObj("servicePEM", string(servicePEM))

 		printObj("createServicePairRes", createServicePairRes)

 	}

-	//return
+	return

 	{
 		listIssuerPairsParams := &cmctl.ListIssuerPairsParams{}
@@ -196,18 +211,7 @@ func TestIssuerCreateN0(t *testing.T) {

 		printObj("getServicePairRes.IssuerCertificates", getServicePairRes.IssuerCertificates)
 	}
-	{
-		getIssuerCertificateParams := &cmctl.GetIssuerCertificateParams{
-			IssuerID: issuerID,
-		}
-		getIssuerCertificateRes, err := lg.GetIssuerCertificate(ctx, userID, getIssuerCertificateParams)
-		require.NoError(t, err)
-		require.NotNil(t, getIssuerCertificateRes)
-		require.NotZero(t, len(getIssuerCertificateRes.Certificate))

-		printObj("getIssuerCertificateRes", getIssuerCertificateRes)
-		require.NoError(t, err)
-	}
 }

 func XXXTestIssuerCreateN2(t *testing.T) {
@@ -229,7 +233,6 @@ func XXXTestIssuerCreateN2(t *testing.T) {
 		require.NoError(t, err)

 		logicConfig := &logic.LogicConfig{
-			Auths:    conf.Auths,
 			Database: db,
 		}
 		lg, err = logic.NewLogic(logicConfig)
--- a/internal/test/logic_issuer_import_test.go
+++ b/internal/test/logic_issuer_import_test.go
@@ -39,7 +39,6 @@ func XXXTestLogicImportIssuer(t *testing.T) {
 		require.NoError(t, err)

 		logicConfig := &logic.LogicConfig{
-			Auths:    conf.Auths,
 			Database: db,
 		}
 		lg, err = logic.NewLogic(logicConfig)