fix: use fixed size int32 (#1155)

Signed-off-by: Andrii Perenesenko <[email protected]>
argoproj · May 10, 2021 · b6aaf4b · b6aaf4b
1 parent 92e2aab
commit b6aaf4b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/pkg/apis/rollouts/v1alpha1/types.go b/pkg/apis/rollouts/v1alpha1/types.go
@@ -543,7 +543,7 @@ type RolloutPause struct {
 func (p RolloutPause) DurationSeconds() int32 {
 	if p.Duration != nil {
 		if p.Duration.Type == intstr.String {
-			s, err := strconv.Atoi(p.Duration.StrVal)
+			s, err := strconv.ParseInt(p.Duration.StrVal, 10, 32)
 			if err != nil {
 				d, err := time.ParseDuration(p.Duration.StrVal)
 				if err != nil {

diff --git a/pkg/apis/rollouts/v1alpha1/types_test.go b/pkg/apis/rollouts/v1alpha1/types_test.go
@@ -21,4 +21,6 @@ func TestRolloutPauseDuration(t *testing.T) {
 	assert.Equal(t, int32(0), rp.DurationSeconds())
 	rp.Duration = DurationFromString("1z")
 	assert.Equal(t, int32(-1), rp.DurationSeconds())
+	rp.Duration = DurationFromString("20000000000") // out of int32
+	assert.Equal(t, int32(-1), rp.DurationSeconds())
 }
diff --git a/utils/annotations/annotations.go b/utils/annotations/annotations.go
@@ -40,7 +40,7 @@ func getIntFromAnnotation(rs *appsv1.ReplicaSet, annotationKey string) (int32, b
 	if !ok {
 		return int32(0), false
 	}
-	intValue, err := strconv.Atoi(annotationValue)
+	intValue, err := strconv.ParseInt(annotationValue, 10, 32)
 	if err != nil {
 		log.Warnf("Cannot convert the value %q with annotation key %q for the replica set %q", annotationValue, annotationKey, rs.Name)
 		return int32(0), false
@@ -186,7 +186,7 @@ func IsSaturated(rollout *v1alpha1.Rollout, rs *appsv1.ReplicaSet) bool {
 		return false
 	}
 	desiredString := rs.Annotations[DesiredReplicasAnnotation]
-	desired, err := strconv.Atoi(desiredString)
+	desired, err := strconv.ParseInt(desiredString, 10, 32)
 	if err != nil {
 		return false
 	}

diff --git a/utils/annotations/annotations_test.go b/utils/annotations/annotations_test.go
@@ -246,6 +246,13 @@ func TestAnnotationUtils(t *testing.T) {
 		}
 	})
 
+	t.Run("GetDesiredReplicasAnnotationOutOfInt32Value", func(t *testing.T) {
+		cRS := tRS.DeepCopy()
+		cRS.Annotations[DesiredReplicasAnnotation] = "20000000000"
+		_, ok := GetDesiredReplicasAnnotation(cRS)
+		assert.Equal(t, false, ok, "Should be an error as 20M value does not fit into int32")
+	})
+
 	//Check if annotations reflect rollouts state
 	tRS.Annotations[DesiredReplicasAnnotation] = "1"
 	tRS.Status.AvailableReplicas = 1