Using ZoneLevel Cloudflare API

Author: DingGGu

internal/providers/cloudflare.go

@@ -112,7 +112,7 @@ func (p *Cloudflare) Reconcile(ctx context.Context, req reconcile.Request, ingre
 		if errors.Is(err, store.ApplicationNotFoundError) {
 			log.Info("Create access application")
 
-			app, err = p.client.CreateAccessApplication(ctx, p.zoneId, r.AccessApplication)
+			app, err = p.client.CreateZoneLevelAccessApplication(ctx, p.zoneId, r.AccessApplication)
 			if err != nil {
 				log.Error(err, "Cannot create access application", "domain", r.Domain)
 				recorder.Event(ingress, corev1.EventTypeWarning, "Error", fmt.Sprintf("Cannot create access application (%s): %s", r.Domain, err.Error()))
@@ -122,7 +122,7 @@ func (p *Cloudflare) Reconcile(ctx context.Context, req reconcile.Request, ingre
 			recorder.Event(ingress, corev1.EventTypeNormal, "Created", fmt.Sprintf("Created Access Application %s (%s) audience tag: %s", app.Name, r.Domain, app.AUD))
 
 			for i, policy := range r.Policies {
-				_, err := p.client.CreateAccessPolicy(ctx, p.zoneId, app.ID, policy)
+				_, err := p.client.CreateZoneLevelAccessPolicy(ctx, p.zoneId, app.ID, policy)
 				if err != nil {
 					log.Error(err, "Cannot create access policy", "policy", policy)
 					recorder.Event(ingress, corev1.EventTypeWarning, "Error", fmt.Sprintf("Cannot create access policy: %v: %s", policy, err.Error()))
@@ -139,7 +139,7 @@ func (p *Cloudflare) Reconcile(ctx context.Context, req reconcile.Request, ingre
 	} else {
 		if !r.Equal(app) { // Check if AccessApplication need update
 			r.AccessApplication.ID = app.ID
-			if app, err = p.client.UpdateAccessApplication(ctx, p.zoneId, r.AccessApplication); err != nil {
+			if app, err = p.client.UpdateZoneLevelAccessApplication(ctx, p.zoneId, r.AccessApplication); err != nil {
 				log.Error(err, "Cannot update access application")
 				recorder.Event(ingress, corev1.EventTypeWarning, "Error", fmt.Sprintf("Cannot update access application: %s", err.Error()))
 				return err
@@ -161,7 +161,7 @@ func (p *Cloudflare) Reconcile(ctx context.Context, req reconcile.Request, ingre
 			if i <= length-1 {
 				if !r.PolicyEqual(i, originPolicies[i]) {
 					policy.ID = originPolicies[i].ID
-					if _, err := p.client.UpdateAccessPolicy(ctx, p.zoneId, app.ID, policy); err != nil { // Update
+					if _, err := p.client.UpdateZoneLevelAccessPolicy(ctx, p.zoneId, app.ID, policy); err != nil { // Update
 						log.Error(err, "Cannot update access policies[%d]", i)
 						recorder.Event(ingress, corev1.EventTypeWarning, "Error", fmt.Sprintf("Cannot update access policy[%d]: %s", i, err.Error()))
 						return err
@@ -174,7 +174,7 @@ func (p *Cloudflare) Reconcile(ctx context.Context, req reconcile.Request, ingre
 					continue
 				}
 			}
-			if _, err := p.client.CreateAccessPolicy(ctx, p.zoneId, app.ID, policy); err != nil { // Create
+			if _, err := p.client.CreateZoneLevelAccessPolicy(ctx, p.zoneId, app.ID, policy); err != nil { // Create
 				log.Error(err, "Cannot create access policies[%d]", i)
 				recorder.Event(ingress, corev1.EventTypeWarning, "Error", fmt.Sprintf("Cannot create access policy[%d]: %s", i, err.Error()))
 				return err
@@ -188,7 +188,7 @@ func (p *Cloudflare) Reconcile(ctx context.Context, req reconcile.Request, ingre
 		if removeRange < length {
 			for i, policy := range originPolicies[removeRange:] {
 				idx := length - 1 + i
-				if err := p.client.DeleteAccessPolicy(ctx, p.zoneId, app.ID, policy.ID); err != nil { // Delete
+				if err := p.client.DeleteZoneLevelAccessPolicy(ctx, p.zoneId, app.ID, policy.ID); err != nil { // Delete
 					log.Error(err, "Cannot delete access policies[%d]", idx)
 					recorder.Event(ingress, corev1.EventTypeWarning, "Error", fmt.Sprintf("Cannot delete access policy[%d]: %s", idx, err.Error()))
 					return err
@@ -220,7 +220,7 @@ func (p *Cloudflare) Delete(ctx context.Context, req reconcile.Request, ingress
 		log.Error(err, "Error from getApplication", "resourceName", resourceName)
 		return err
 	} else {
-		return p.client.DeleteAccessApplication(ctx, p.zoneId, app.ID)
+		return p.client.DeleteZoneLevelAccessApplication(ctx, p.zoneId, app.ID)
 	}
 }
 
@@ -250,6 +250,7 @@ func NewCloudflare(apiToken string, log logr.Logger, zoneName, clusterName strin
 	}
 
 	zoneId, err := client.ZoneIDByName(zoneName)
+	log.Info(fmt.Sprintf("Get zoneId: %s", zoneId))
 	if nil != err {
 		log.Error(err, "cannot find zoneId", "zoneName", zoneName)
 		os.Exit(1)

internal/store/store.go

@@ -37,7 +37,7 @@ func (s *Store) getApplications(ctx context.Context) error {
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 
-	res, _, err := s.client.AccessApplications(ctx, s.zoneId, cloudflare.PaginationOptions{})
+	res, _, err := s.client.ZoneLevelAccessApplications(ctx, s.zoneId, cloudflare.PaginationOptions{})
 	if err != nil {
 		s.log.Error(err, "Cannot get access applications")
 		return err
@@ -51,7 +51,7 @@ func (s *Store) GetPolicies(ctx context.Context, appId string) ([]cloudflare.Acc
 	s.mutex.Lock()
 	defer s.mutex.Unlock()
 
-	res, _, err := s.client.AccessPolicies(ctx, s.zoneId, appId, cloudflare.PaginationOptions{})
+	res, _, err := s.client.ZoneLevelAccessPolicies(ctx, s.zoneId, appId, cloudflare.PaginationOptions{})
 	if err != nil {
 		return nil, err
 	}