From 25e6014010f5e9b9f2a8d0b15881a9b36fdd6b50 Mon Sep 17 00:00:00 2001 From: Maxwell Weru Date: Mon, 17 Jul 2023 09:13:22 +0300 Subject: [PATCH] Use the minimum billable vCPU and GB for Container Instances (#710) --- .../Models/UpdateJobResourcesTests.cs | 24 ------------------- .../Models/UpdateJobResources.cs | 11 +++++---- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/server/Tingle.Dependabot.Tests/Models/UpdateJobResourcesTests.cs b/server/Tingle.Dependabot.Tests/Models/UpdateJobResourcesTests.cs index 6057b0f6..041cfc6e 100644 --- a/server/Tingle.Dependabot.Tests/Models/UpdateJobResourcesTests.cs +++ b/server/Tingle.Dependabot.Tests/Models/UpdateJobResourcesTests.cs @@ -11,28 +11,4 @@ public void FromEcosystem_Works() var values = Enum.GetValues(); Assert.All(values, ecosystem => UpdateJobResources.FromEcosystem(ecosystem)); } - - [Theory] - [InlineData(DependabotPackageEcosystem.Bundler, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Cargo, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Composer, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Docker, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Elixir, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Elm, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.GitSubmodule, 0.1, 0.2)] - [InlineData(DependabotPackageEcosystem.GithubActions, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.GoModules, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Gradle, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Maven, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Mix, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Npm, 0.25, 1.0)] - [InlineData(DependabotPackageEcosystem.NuGet, 0.25, 0.2)] - [InlineData(DependabotPackageEcosystem.Pip, 0.25, 0.5)] - [InlineData(DependabotPackageEcosystem.Terraform, 0.25, 1.0)] - public void FromEcosystem_ExpectedValues(DependabotPackageEcosystem ecosystem, double expectedCpu, double expectedMemory) - { - var resources = UpdateJobResources.FromEcosystem(ecosystem); - Assert.Equal(expectedCpu, resources.Cpu); - Assert.Equal(expectedMemory, resources.Memory); - } } diff --git a/server/Tingle.Dependabot/Models/UpdateJobResources.cs b/server/Tingle.Dependabot/Models/UpdateJobResources.cs index dd8ca2e9..1532ba30 100644 --- a/server/Tingle.Dependabot/Models/UpdateJobResources.cs +++ b/server/Tingle.Dependabot/Models/UpdateJobResources.cs @@ -31,13 +31,14 @@ public UpdateJobResources(double cpu, double memory) public static UpdateJobResources FromEcosystem(DependabotPackageEcosystem ecosystem) { + // the minimum we can be billed for on Container Instances is 1vCPU and 1GB, we might as well use it return ecosystem switch { - DependabotPackageEcosystem.NuGet => new(cpu: 0.25, memory: 0.2), - DependabotPackageEcosystem.GitSubmodule => new(cpu: 0.1, memory: 0.2), - DependabotPackageEcosystem.Terraform => new(cpu: 0.25, memory: 1), - DependabotPackageEcosystem.Npm => new(cpu: 0.25, memory: 1), - _ => new UpdateJobResources(cpu: 0.25, memory: 0.5), + //DependabotPackageEcosystem.NuGet => new(cpu: 0.25, memory: 0.2), + //DependabotPackageEcosystem.GitSubmodule => new(cpu: 0.1, memory: 0.2), + //DependabotPackageEcosystem.Terraform => new(cpu: 0.25, memory: 1), + //DependabotPackageEcosystem.Npm => new(cpu: 0.25, memory: 1), + _ => new UpdateJobResources(cpu: 1, memory: 1), // the minimum }; }