capabilitiesV2: promote proxy config to staging env

3scale · Jun 19, 2020 · c5b3550 · c5b3550
1 parent 275516b
commit c5b3550
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/pkg/controller/product/3scale_reconciler.go b/pkg/controller/product/3scale_reconciler.go
@@ -49,10 +49,8 @@ func (t *ThreescaleReconciler) Reconcile() (*helper.ProductEntity, error) {
 	taskRunner.AddTask("SyncMetrics", t.syncMetrics)
 	taskRunner.AddTask("SyncMappingRules", t.syncMappingRules)
 	taskRunner.AddTask("SyncApplicationPlans", t.syncApplicationPlans)
-	// TODO Implement policies reconciliation
-	// taskRunner.AddTask("SyncPolicies", t.syncPolicies)
 	// This should be the last step
-	taskRunner.AddTask("BumbProxyVersion", t.bumpProxyVersion)
+	taskRunner.AddTask("PromoteProxyToStaging", t.promoteProxyToStaging)
 
 	err = taskRunner.Run()
 	if err != nil {
@@ -62,9 +60,10 @@ func (t *ThreescaleReconciler) Reconcile() (*helper.ProductEntity, error) {
 	return t.productEntity, nil
 }
 
-func (t *ThreescaleReconciler) bumpProxyVersion(_ interface{}) error {
-	// POST /admin/api/services/{service_id}/proxy/deploy.json ????
-	return nil
+func (t *ThreescaleReconciler) promoteProxyToStaging(_ interface{}) error {
+	// 3scale API does not expose a way to check if promotion is necessary
+	// PromoteProxyToStaging operation is idempotent and not expensive, though.
+	return t.productEntity.PromoteProxyToStaging()
 }
 
 func (t *ThreescaleReconciler) reconcile3scaleProduct() (*helper.ProductEntity, error) {

diff --git a/pkg/helper/product_entity.go b/pkg/helper/product_entity.go
@@ -295,11 +295,12 @@ func (b *ProductEntity) Proxy() (*threescaleapi.ProxyJSON, error) {
 
 func (b *ProductEntity) UpdateProxy(params threescaleapi.Params) error {
 	b.logger.V(1).Info("UpdateProxy", "params", params)
-	_, err := b.client.UpdateProductProxy(b.productObj.Element.ID, params)
+	updated, err := b.client.UpdateProductProxy(b.productObj.Element.ID, params)
 	if err != nil {
 		return fmt.Errorf("product [%s] update proxy: %w", b.productObj.Element.SystemName, err)
 	}
-	b.resetProxy()
+
+	b.proxy = updated
 	return nil
 }
 
@@ -335,15 +336,22 @@ func (b *ProductEntity) CreateApplicationPlan(params threescaleapi.Params) (*thr
 	return obj, nil
 }
 
+func (b *ProductEntity) PromoteProxyToStaging() error {
+	b.logger.V(1).Info("PromoteProxyToStaging")
+	proxyObj, err := b.client.DeployProductProxy(b.productObj.Element.ID)
+	if err != nil {
+		return fmt.Errorf("product [%s] promote proxy to staging: %w", b.productObj.Element.SystemName, err)
+	}
+
+	b.proxy = proxyObj
+	return nil
+}
+
 //
 // PRIVATE
 //
 //
 
-func (b *ProductEntity) resetProxy() {
-	b.proxy = nil
-}
-
 func (b *ProductEntity) resetBackendUsages() {
 	b.backendUsages = nil
 }