removing flag

Signed-off-by: Javan lacerda <javanlacerda@google.com>
javanlacerda · Jun 17, 2024 · 68428d7 · 68428d7
1 parent 34256b8
commit 68428d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/config/fulcio-config.yaml b/config/fulcio-config.yaml
@@ -99,16 +99,7 @@ data:
             },
             "https://token.actions.githubusercontent.com/*": {
               "ClientID": "sigstore",
-<<<<<<< HEAD
               "Type": "github-workflow"
-=======
-              "Type": "github-workflow",
-<<<<<<< HEAD
-              "IsCiProvider": true
->>>>>>> moving github-workflows to configfile
-=======
-              "IsCiProvider": false
->>>>>>> set is ci provider as false
             }
           }
         }

diff --git a/federation/main.go b/federation/main.go
@@ -144,19 +144,17 @@ func main() {
 	for providerType, provider := range conf.Providers {
 		for _, issuer := range provider.OIDCIssuers {
 			fulcioCfg := config.OIDCIssuer{
-				IssuerURL:    issuer.IssuerURL,
-				ClientID:     "sigstore",
-				Type:         config.IssuerType(providerType),
-				IssuerClaim:  issuer.IssuerClaim,
-				IsCiProvider: issuer.IsCiProvider,
+				IssuerURL:   issuer.IssuerURL,
+				ClientID:    "sigstore",
+				Type:        config.IssuerType(providerType),
+				IssuerClaim: issuer.IssuerClaim,
 			}
 			fulcioConfig.OIDCIssuers[fulcioCfg.IssuerURL] = fulcioCfg
 		}
 		for _, issuer := range provider.MetaIssuers {
 			fulcioMetaCfg := config.OIDCIssuer{
-				ClientID:     "sigstore",
-				Type:         config.IssuerType(providerType),
-				IsCiProvider: issuer.IsCiProvider,
+				ClientID: "sigstore",
+				Type:     config.IssuerType(providerType),
 			}
 			fulcioConfig.MetaIssuers[issuer.IssuerURL] = fulcioMetaCfg
 		}