Sdk v2.0.0 (#139)

* Update Version information

* Missed the build

* Force Travis

* Force Travis

* Update CSR to Csr

CHANGELOG.md

@@ -2,7 +2,12 @@
 Running changelog of releases since `2.0.0-rc.4`
 
 ## v2.0.0
-- Official Release of v2 Okta Golang SDK
+- Official Release of v2 Okta Golang SDK (June 4, 2020)
+- `CSR` Model has been renamed to `Csr`
+- `CSRMetadata` Model has been renamed to `CsrMetadata`
+- `CSRMetadataSubject` Model has been renamed to `CsrMetadataSubject`
+- `CSRMetadataSubjectAltNames` Model has been renamed to `CsrMetadataSubjectAltNames`
+- `GenerateCsrForIdentityProvider` now sets accept header correctly to `application/json`
 
 ## v2.0.0-rc.5
 - Remove `PreviewSamlMetadataForApplication` method from `ApplicationResource`

okta/application.go

@@ -165,16 +165,16 @@ func (m *ApplicationResource) CreateApplication(ctx context.Context, body App, q
 	return application, resp, nil
 }
 
-// Enumerates CSRs for an application
-func (m *ApplicationResource) ListCsrsForApplication(ctx context.Context, appId string) ([]*CSR, *Response, error) {
+// Enumerates Certificate Signing Requests for an application
+func (m *ApplicationResource) ListCsrsForApplication(ctx context.Context, appId string) ([]*Csr, *Response, error) {
 	url := fmt.Sprintf("/api/v1/apps/%v/credentials/csrs", appId)
 
 	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var csr []*CSR
+	var csr []*Csr
 
 	resp, err := m.client.requestExecutor.Do(ctx, req, &csr)
 	if err != nil {
@@ -185,15 +185,15 @@ func (m *ApplicationResource) ListCsrsForApplication(ctx context.Context, appId
 }
 
 // Generates a new key pair and returns the Certificate Signing Request for it.
-func (m *ApplicationResource) GenerateCsrForApplication(ctx context.Context, appId string, body CSRMetadata) (*CSR, *Response, error) {
+func (m *ApplicationResource) GenerateCsrForApplication(ctx context.Context, appId string, body CsrMetadata) (*Csr, *Response, error) {
 	url := fmt.Sprintf("/api/v1/apps/%v/credentials/csrs", appId)
 
 	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("POST", url, body)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var csr *CSR
+	var csr *Csr
 
 	resp, err := m.client.requestExecutor.Do(ctx, req, &csr)
 	if err != nil {
@@ -203,7 +203,7 @@ func (m *ApplicationResource) GenerateCsrForApplication(ctx context.Context, app
 	return csr, resp, nil
 }
 
-func (m *ApplicationResource) RevokeCSRFromApplication(ctx context.Context, appId string, csrId string) (*Response, error) {
+func (m *ApplicationResource) RevokeCsrFromApplication(ctx context.Context, appId string, csrId string) (*Response, error) {
 	url := fmt.Sprintf("/api/v1/apps/%v/credentials/csrs/%v", appId, csrId)
 
 	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("DELETE", url, nil)
@@ -219,15 +219,15 @@ func (m *ApplicationResource) RevokeCSRFromApplication(ctx context.Context, appI
 	return resp, nil
 }
 
-func (m *ApplicationResource) GetCsrForApplication(ctx context.Context, appId string, csrId string) (*CSR, *Response, error) {
+func (m *ApplicationResource) GetCsrForApplication(ctx context.Context, appId string, csrId string) (*Csr, *Response, error) {
 	url := fmt.Sprintf("/api/v1/apps/%v/credentials/csrs/%v", appId, csrId)
 
 	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var csr *CSR
+	var csr *Csr
 
 	resp, err := m.client.requestExecutor.Do(ctx, req, &csr)
 	if err != nil {

okta/csr.go

@@ -22,7 +22,7 @@ import (
 	"time"
 )
 
-type CSR struct {
+type Csr struct {
 	Created *time.Time `json:"created,omitempty"`
 	Csr     string     `json:"csr,omitempty"`
 	Id      string     `json:"id,omitempty"`

okta/csrMetadata.go

@@ -20,7 +20,7 @@ package okta
 
 import ()
 
-type CSRMetadata struct {
-	Subject         *CSRMetadataSubject         `json:"subject,omitempty"`
-	SubjectAltNames *CSRMetadataSubjectAltNames `json:"subjectAltNames,omitempty"`
+type CsrMetadata struct {
+	Subject         *CsrMetadataSubject         `json:"subject,omitempty"`
+	SubjectAltNames *CsrMetadataSubjectAltNames `json:"subjectAltNames,omitempty"`
 }

okta/csrMetadataSubject.go

@@ -20,7 +20,7 @@ package okta
 
 import ()
 
-type CSRMetadataSubject struct {
+type CsrMetadataSubject struct {
 	CommonName             string `json:"commonName,omitempty"`
 	CountryName            string `json:"countryName,omitempty"`
 	LocalityName           string `json:"localityName,omitempty"`

okta/csrMetadataSubjectAltNames.go

@@ -20,6 +20,6 @@ package okta
 
 import ()
 
-type CSRMetadataSubjectAltNames struct {
+type CsrMetadataSubjectAltNames struct {
 	DnsNames []string `json:"dnsNames,omitempty"`
 }

okta/identityProvider.go

@@ -213,16 +213,16 @@ func (m *IdentityProviderResource) GetIdentityProviderKey(ctx context.Context, k
 	return jsonWebKey, resp, nil
 }
 
-// Enumerates signing CSRs for an IdP
-func (m *IdentityProviderResource) ListCsrsForIdentityProvider(ctx context.Context, idpId string) ([]*CSR, *Response, error) {
+// Enumerates Certificate Signing Requests for an IdP
+func (m *IdentityProviderResource) ListCsrsForIdentityProvider(ctx context.Context, idpId string) ([]*Csr, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs", idpId)
 
 	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var csr []*CSR
+	var csr []*Csr
 
 	resp, err := m.client.requestExecutor.Do(ctx, req, &csr)
 	if err != nil {
@@ -233,15 +233,15 @@ func (m *IdentityProviderResource) ListCsrsForIdentityProvider(ctx context.Conte
 }
 
 // Generates a new key pair and returns a Certificate Signing Request for it.
-func (m *IdentityProviderResource) GenerateCsrForIdentityProvider(ctx context.Context, idpId string, body CSRMetadata) (*CSR, *Response, error) {
+func (m *IdentityProviderResource) GenerateCsrForIdentityProvider(ctx context.Context, idpId string, body CsrMetadata) (*Csr, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs", idpId)
 
-	req, err := m.client.requestExecutor.WithAccept("application/pkcs10").WithContentType("application/json").NewRequest("POST", url, body)
+	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("POST", url, body)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var csr *CSR
+	var csr *Csr
 
 	resp, err := m.client.requestExecutor.Do(ctx, req, &csr)
 	if err != nil {
@@ -251,7 +251,7 @@ func (m *IdentityProviderResource) GenerateCsrForIdentityProvider(ctx context.Co
 	return csr, resp, nil
 }
 
-// Revoke a CSR and delete the key pair from the IdP
+// Revoke a Certificate Signing Request and delete the key pair from the IdP
 func (m *IdentityProviderResource) RevokeCsrForIdentityProvider(ctx context.Context, idpId string, csrId string) (*Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v", idpId, csrId)
 
@@ -268,16 +268,16 @@ func (m *IdentityProviderResource) RevokeCsrForIdentityProvider(ctx context.Cont
 	return resp, nil
 }
 
-// Gets a specific CSR model by id
-func (m *IdentityProviderResource) GetCsrForIdentityProvider(ctx context.Context, idpId string, csrId string) (*CSR, *Response, error) {
+// Gets a specific Certificate Signing Request model by id
+func (m *IdentityProviderResource) GetCsrForIdentityProvider(ctx context.Context, idpId string, csrId string) (*Csr, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v", idpId, csrId)
 
 	req, err := m.client.requestExecutor.WithAccept("application/json").WithContentType("application/json").NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	var csr *CSR
+	var csr *Csr
 
 	resp, err := m.client.requestExecutor.Do(ctx, req, &csr)
 	if err != nil {
@@ -287,7 +287,7 @@ func (m *IdentityProviderResource) GetCsrForIdentityProvider(ctx context.Context
 	return csr, resp, nil
 }
 
-// Update the CSR with a signed X.509 certificate and add it into the signing key credentials for the IdP.
+// Update the Certificate Signing Request with a signed X.509 certificate and add it into the signing key credentials for the IdP.
 func (m *IdentityProviderResource) PublishCerCertForIdentityProvider(ctx context.Context, idpId string, csrId string, body string) (*JsonWebKey, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v/lifecycle/publish", idpId, csrId)
 
@@ -306,7 +306,7 @@ func (m *IdentityProviderResource) PublishCerCertForIdentityProvider(ctx context
 	return jsonWebKey, resp, nil
 }
 
-// Update the CSR with a signed X.509 certificate and add it into the signing key credentials for the IdP.
+// Update the Certificate Signing Request with a signed X.509 certificate and add it into the signing key credentials for the IdP.
 func (m *IdentityProviderResource) PublishBinaryCerCertForIdentityProvider(ctx context.Context, idpId string, csrId string, body string) (*JsonWebKey, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v/lifecycle/publish", idpId, csrId)
 
@@ -325,7 +325,7 @@ func (m *IdentityProviderResource) PublishBinaryCerCertForIdentityProvider(ctx c
 	return jsonWebKey, resp, nil
 }
 
-// Update the CSR with a signed X.509 certificate and add it into the signing key credentials for the IdP.
+// Update the Certificate Signing Request with a signed X.509 certificate and add it into the signing key credentials for the IdP.
 func (m *IdentityProviderResource) PublishDerCertForIdentityProvider(ctx context.Context, idpId string, csrId string, body string) (*JsonWebKey, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v/lifecycle/publish", idpId, csrId)
 
@@ -344,7 +344,7 @@ func (m *IdentityProviderResource) PublishDerCertForIdentityProvider(ctx context
 	return jsonWebKey, resp, nil
 }
 
-// Update the CSR with a signed X.509 certificate and add it into the signing key credentials for the IdP.
+// Update the Certificate Signing Request with a signed X.509 certificate and add it into the signing key credentials for the IdP.
 func (m *IdentityProviderResource) PublishBinaryDerCertForIdentityProvider(ctx context.Context, idpId string, csrId string, body string) (*JsonWebKey, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v/lifecycle/publish", idpId, csrId)
 
@@ -363,7 +363,7 @@ func (m *IdentityProviderResource) PublishBinaryDerCertForIdentityProvider(ctx c
 	return jsonWebKey, resp, nil
 }
 
-// Update the CSR with a signed X.509 certificate and add it into the signing key credentials for the IdP.
+// Update the Certificate Signing Request with a signed X.509 certificate and add it into the signing key credentials for the IdP.
 func (m *IdentityProviderResource) PublishBinaryPemCertForIdentityProvider(ctx context.Context, idpId string, csrId string, body string) (*JsonWebKey, *Response, error) {
 	url := fmt.Sprintf("/api/v1/idps/%v/credentials/csrs/%v/lifecycle/publish", idpId, csrId)
 

okta/okta.go

@@ -30,7 +30,7 @@ import (
 	"github.com/kelseyhightower/envconfig"
 )
 
-const Version = "2.0.0-rc.5"
+const Version = "2.0.0"
 
 type Client struct {
 	config *config

openapi/generator/index.js

@@ -79,13 +79,13 @@ function lowercaseFirstLetter(text) {
 function ucFirst(text) {
 	switch(text) {
   	case 'csr':
-    	return 'CSR';
+    	return 'Csr';
     case 'csrMetadata':
-    	return 'CSRMetadata';
+    	return 'CsrMetadata';
     case 'csrMetadataSubject':
-    	return 'CSRMetadataSubject';
+    	return 'CsrMetadataSubject';
     case 'csrMetadataSubjectAltNames':
-    	return 'CSRMetadataSubjectAllNames';
+    	return 'CsrMetadataSubjectAllNames';
   	default:
       return text.charAt(0).toUpperCase() + text.slice(1);
   }
@@ -184,6 +184,11 @@ function getImports(object) {
 
   imports = [...new Set(imports)];
 
+  if (object.model.modelName == "Role") {
+    imports.splice (imports.indexOf("context"), 1);
+    imports.splice (imports.indexOf("fmt"), 1);
+  }
+
   return imports;
 }
 
@@ -373,6 +378,22 @@ function buildModelProperties(model) {
   return finalProps.join("\n\t");
 }
 
+function isInstance(model) {
+  if ( model.modelName == "Csr" ||
+      model.modelName == "CsrMetadata" ||
+      model.modelName == "CsrMetadataSubject" ||
+      model.modelName == "CsrMetadataSubjectAltNames" ||
+      model.modelName == "OAuth2Claim" ||
+      model.modelName == "OAuth2ScopeConsentGrant") {
+    return false
+  }
+
+  if ( model.tags[0] == "Application" || model.tags[0] == "UserFactor") {
+      return true
+  }
+  return false
+}
+
 function log(item) {
     console.log(item);
 }
@@ -491,7 +512,8 @@ golang.process = ({ spec, operations, models, handlebars }) => {
     responseModelInterface,
     applicationModelInterface,
     factorModelInterface,
-    factorInstanceOperation
+    factorInstanceOperation,
+    isInstance
   });
 
   handlebars.registerPartial('partials.copyHeader', fs.readFileSync('generator/templates/partials/copyHeader.hbs', 'utf8'));

openapi/generator/templates/model.go.hbs

@@ -21,7 +21,7 @@ type Factor interface {
 }
 
 {{/if}}
-{{#if (or (or (gt model.methods.length 0) (gt model.crud.length 0)) (eq model.modelName "LogEvent"))}}
+{{#if (and (or (or (gt model.methods.length 0) (gt model.crud.length 0)) (eq model.modelName "LogEvent")) (ne model.modelName "Role"))}}
 type {{model.modelName}}Resource resource
 
 {{/if}}
@@ -36,7 +36,7 @@ type {{model.modelName}} struct {
 {{/if}}
 {{#if model.enum}}
 {{else}}
-{{#if (or ( eq model.tags.[0] "Application" ) ( eq model.tags.[0] "UserFactor") ) }}
+{{#if (isInstance model) }}
 func New{{model.modelName}}() *{{model.modelName}} {
 	return &{{model.modelName}}{
 		{{#each model.properties as |prop|}}

tests/integration/application_test.go

@@ -410,7 +410,7 @@ func Test_can_create_csr_for_application(t *testing.T) {
 
 	application := create_application(t)
 
-	subject := okta.CSRMetadataSubject{
+	subject := okta.CsrMetadataSubject{
 		CountryName:            "US",
 		StateOrProvinceName:    "California",
 		LocalityName:           "San Francisco",
@@ -419,19 +419,19 @@ func Test_can_create_csr_for_application(t *testing.T) {
 		CommonName:             "SP Issuer",
 	}
 
-	subjectAltNames := okta.CSRMetadataSubjectAltNames{
+	subjectAltNames := okta.CsrMetadataSubjectAltNames{
 		DnsNames: []string{"dev.okta.com"},
 	}
 
-	csr := okta.CSRMetadata{
+	csr := okta.CsrMetadata{
 		Subject:         &subject,
 		SubjectAltNames: &subjectAltNames,
 	}
 
 	csrs, _, err := client.Application.GenerateCsrForApplication(ctx, application.Id, csr)
-	require.NoError(t, err, "Creating an application CSR should not error")
+	require.NoError(t, err, "Creating an application Csr should not error")
 
-	assert.IsType(t, &okta.CSR{}, csrs, "did not return a `okta.CSR` object")
+	assert.IsType(t, &okta.Csr{}, csrs, "did not return a `okta.Csr` object")
 
 	client.Application.DeactivateApplication(ctx, application.Id)
 	_, err = client.Application.DeleteApplication(ctx, application.Id)